@@ -32,30 +32,17 @@

 using std::map;

-void app_timer_cb(timer* t, unsigned int data1, void* data2) {

-  AmAppTimer::instance()->app_timer_cb(t, data1, data2);

-}

-

 app_timer::app_timer(const string& q_id, int timer_id, unsigned int expires)

-  : timer(timer_id<0 ? 1 : 0, expires, (timer_cb)app_timer_cb,

-	  abs(timer_id), strdup(q_id.c_str())) { }

+  : timer(expires),

+    timer_id(timer_id), q_id(q_id)

+{ }

-app_timer::~app_timer() {

-  if (NULL != data2) {

-    free(data2);

-    //    delete[] data2;

-  }

-}

+app_timer::~app_timer() 

+{ }

-int app_timer::get_id() {

-  return type == 1 ? -data1 : data1;

-}

-

-string app_timer::get_q_id() {

-  if (NULL != data2)

-    return string((char*)data2);

-  else

-    return string();

+void app_timer::fire() 

+{

+  AmAppTimer::instance()->app_timer_cb(this);

 }

 _AmAppTimer::_AmAppTimer() {

@@ -64,17 +51,8 @@ _AmAppTimer::_AmAppTimer() {

 _AmAppTimer::~_AmAppTimer() {

 }

-void _AmAppTimer::app_timer_cb(timer* t, unsigned int data1, void* data2) {

-  if (NULL == t)

-    return;

-

-  app_timer* at = dynamic_cast<app_timer*>(t);

-  if (NULL == at) {

-    ERROR("internal: wrong timer object\n");

-    //   delete t; // ???

-    return;

-  }

-

+void _AmAppTimer::app_timer_cb(app_timer* at)

+{

   app_timer* at_local = erase_timer(at->get_q_id(), at->get_id());

   if (NULL != at_local) {

@@ -33,12 +33,20 @@

 using std::string;

 #include <map>

-class app_timer : public timer {

+class app_timer : public timer 

+{

+  string q_id;

+  int    timer_id;

+

  public:

   app_timer(const string& q_id, int timer_id, unsigned int expires);

   ~app_timer();

-  int get_id();

-  string get_q_id();

+

+  int get_id() { return timer_id; }

+  string get_q_id() { return q_id; }

+

+  // timer interface

+  void fire();

 };

@@ -63,7 +71,7 @@ class _AmAppTimer : public _wheeltimer {

   /** remove all timers for event queue eventqueue_name */

   void removeTimers(const string& eventqueue_name);

-  void app_timer_cb(timer* t, unsigned int data1, void* data2);

+  void app_timer_cb(app_timer* at);

 };

 typedef singleton<_AmAppTimer> AmAppTimer;

@@ -49,7 +49,7 @@ int _timer_type_lookup[] = {

     1,     // STIMER_C; shares the same slot at STIMER_B (INV trans only)

 };

-inline timer** fetch_timer(unsigned int timer_type, timer** base)

+inline trans_timer** fetch_timer(unsigned int timer_type, trans_timer** base)

 {

     timer_type &= 0xFFFF;

@@ -115,7 +115,7 @@ bool sip_trans::is_timer_set(unsigned int timer_type)

  *

  * @param timer_type @see sip_timer_type

  */

-timer* sip_trans::get_timer(unsigned int timer_type)

+trans_timer* sip_trans::get_timer(unsigned int timer_type)

 {

     return *fetch_timer(timer_type,timers);

 }

@@ -131,37 +131,37 @@ char _timer_name_lookup[] = {'0','A','B','D','E','F','K','G','H','I','J','L','M'

  * @param t the new timer

  * @param timer_type @see sip_timer_type

  */

-void sip_trans::reset_timer(timer* t, unsigned int timer_type)

+void sip_trans::reset_timer(trans_timer* t, unsigned int timer_type)

 {

-    timer** tp = fetch_timer(timer_type,timers);

+    trans_timer** tp = fetch_timer(timer_type,timers);

     if(*tp != NULL){

 	DBG("Clearing old timer of type %c (this=%p)\n",timer_name((*tp)->type),*tp);

-	wheeltimer::instance()->remove_timer(*tp);

+	wheeltimer::instance()->remove_timer((timer*)*tp);

     }

     *tp = t;

     if(t)

-	wheeltimer::instance()->insert_timer(t);

+	wheeltimer::instance()->insert_timer((timer*)t);

 }

-void trans_timer_cb(timer* t, unsigned int bucket_id, sip_trans* tr)

+void trans_timer::fire()

 {

     trans_bucket* bucket = get_trans_bucket(bucket_id);

     if(bucket){

 	bucket->lock();

-	if(bucket->exist(tr)){

+	if(bucket->exist(t)){

 	    DBG("Transaction timer expired: type=%c, trans=%p, eta=%i, t=%i\n",

-		timer_name(t->type),tr,t->expires,wheeltimer::instance()->wall_clock);

+		timer_name(type),t,expires,wheeltimer::instance()->wall_clock);

 	    // timer_expired unlocks the bucket

-	    trans_layer::instance()->timer_expired(t,bucket,tr);

+	    trans_layer::instance()->timer_expired(this,bucket,t);

 	}

 	else {

 	    WARN("Ignoring expired timer (%p): transaction"

-		 " %p does not exist anymore\n",t,tr);

+		 " %p does not exist anymore\n",this,t);

 	    bucket->unlock();

 	}

     }

@@ -187,16 +187,15 @@ void sip_trans::reset_timer(unsigned int timer_type, unsigned int expire_delay /

     DBG("New timer of type %c at time=%i (repeated=%i)\n",

 	timer_name(timer_type),expires,timer_type>>16);

-    timer* t = new timer(timer_type,expires,

-			 (timer_cb)trans_timer_cb,

-			 bucket_id,this);

+    trans_timer* t = new trans_timer(timer_type,expires,

+				     bucket_id,this);

     reset_timer(t,timer_type);

 }

 void sip_trans::clear_timer(unsigned int timer_type)

 {

-    reset_timer((timer*)NULL,timer_type);

+    reset_timer((trans_timer*)NULL,timer_type);

 }

 void sip_trans::reset_all_timers()

@@ -204,7 +203,7 @@ void sip_trans::reset_all_timers()

     for(int i=0; i<SIP_TRANS_TIMERS; i++){

 	if(timers[i]){

-	    wheeltimer::instance()->remove_timer(timers[i]);

+	    wheeltimer::instance()->remove_timer((timer*)timers[i]);

 	    timers[i] = NULL;

 	}

     }

@@ -31,6 +31,7 @@

 #define _sip_trans_h

 #include "cstring.h"

+#include "wheeltimer.h"

 #include <sys/socket.h>

@@ -70,12 +71,28 @@ enum {

  */

 #define SIP_TRANS_TIMERS 3

-class timer;

+class sip_trans;

+class trans_timer

+    : protected timer

+{

+public:

+    unsigned int type;

+    unsigned int bucket_id;

+    sip_trans*   t;

+

+    trans_timer(unsigned int timer_type, unsigned int expires,

+		int bucket_id, sip_trans* t)

+        : timer(expires), type(timer_type),

+	  bucket_id(bucket_id), t(t)

+    {}

+

+    void fire();

+};

 class sip_trans

 {

-    timer* timers[SIP_TRANS_TIMERS];

+    trans_timer* timers[SIP_TRANS_TIMERS];

     /**

      * Resets a specific timer

@@ -83,7 +100,7 @@ class sip_trans

      * @param t the new timer

      * @param timer_type @see sip_timer_type

     */

-    void reset_timer(timer* t, unsigned int timer_type);    

+    void reset_timer(trans_timer* t, unsigned int timer_type);

  public:

     /** Transaction type */

@@ -133,7 +150,7 @@ class sip_trans

      *

      * @param timer_type @see sip_timer_type

      */

-    timer* get_timer(unsigned int timer_type);

+    trans_timer* get_timer(unsigned int timer_type);

     /**

@@ -1730,7 +1730,8 @@ void _trans_layer::send_non_200_ack(sip_msg* reply, sip_trans* t)

 }

-void _trans_layer::timer_expired(timer* t, trans_bucket* bucket, sip_trans* tr)

+void _trans_layer::timer_expired(trans_timer* t, trans_bucket* bucket,

+				 sip_trans* tr)

 {

     int n = t->type >> 16;

     int type = t->type & 0xFFFF;

@@ -1880,7 +1881,7 @@ void _trans_layer::timer_expired(timer* t, trans_bucket* bucket, sip_trans* tr)

 	break;

     default:

-	ERROR("Invalid timer type %i\n",t->type);

+	ERROR("Invalid timer type %i\n",type);

 	break;

     }

@@ -1989,7 +1990,7 @@ int _trans_layer::try_next_ip(trans_bucket* bucket, sip_trans* tr)

     tr->msg->send();

     // reset counter for timer A & E

-    timer* A_E_timer = tr->get_timer(STIMER_A);

+    trans_timer* A_E_timer = tr->get_timer(STIMER_A);

     tr->reset_timer(A_E_timer->type & 0xFFFF,A_TIMER,bucket->get_id());

     if(!tr->msg->h_dns.eoip())

@@ -46,9 +46,9 @@ struct sockaddr_storage;

 class trans_ticket;

 class trans_bucket;

+class trans_timer;

 class trsp_socket;

 class sip_ua;

-class timer;

 /** 

  * The transaction layer object.

@@ -123,7 +123,7 @@ public:

      * At this place, the bucket is already locked, so

      * please be quick.

      */

-    void timer_expired(timer* t, trans_bucket* bucket, sip_trans* tr);

+    void timer_expired(trans_timer* t, trans_bucket* bucket, sip_trans* tr);

     sip_ua*              ua;

     vector<trsp_socket*> transports;

@@ -180,7 +180,7 @@ void _wheeltimer::process_current_timers()

 	t->next = NULL;

 	t->prev = NULL;

-	t->cb(t,t->data1,t->data2);

+	t->fire();

 	t = t1;

     }

@@ -43,9 +43,6 @@

 // do not change

 #define WHEELS 4

-class timer;

-typedef void (*timer_cb)(timer*,unsigned int /*data1*/,void* /*data2*/);

-

 class base_timer

 {

 public:

@@ -61,26 +58,19 @@ public:

     base_timer*  prev;

     u_int32_t    expires;

-    unsigned int type;

-    timer_cb     cb;

-    unsigned int data1;

-    void*        data2;

-    

-

     timer() 

-	: base_timer(),type(0),

-	  prev(0), expires(0),cb(0),

-	  data1(0),data2(0) 

+	: base_timer(),

+	  prev(0), expires(0) 

     {}

-    timer(unsigned int timer_type, unsigned int expires, timer_cb cb, int data1, void* data2)

-	: base_timer(),type(timer_type),

-	  prev(0), expires(expires), cb(cb), 

-	  data1(data1),data2(data2)

+    timer(unsigned int expires)

+        : base_timer(),

+	  prev(0), expires(expires)

     {}

     ~timer(); 

-    

+

+    virtual void fire()=0;

 };

 #include "singleton.h"

@@ -128,7 +118,6 @@ public:

     //clock reference

     volatile u_int32_t wall_clock; // 32 bits

-    void clock_work();

     void insert_timer(timer* t);

     void remove_timer(timer* t);

 };