--- /usr/src/orig/openser-1.1.0-tls/modules/registrar/reg_mod.c 2006-04-13 18:44:04.000000000 +0200 +++ reg_mod.c 2006-10-04 15:59:16.000000000 +0200 @@ -29,6 +29,9 @@ * (janakj) * 2005-07-11 added sip_natping_flag for nat pinging with SIP method * instead of UDP package (bogdan) + * 2006-10-04 removed the "desc_time_order" parameter, since it does not + * work as described and the "desc_time_order" parameter is also + * available in the usrloc module. (Carsten Bock, BASIS AudioNet GmbH) */ #include @@ -63,8 +66,6 @@ int append_branches = 1; /* If set to 1, username in aor will be case sensitive */ int case_sensitive = 0; -/* By default do not order according to the descending modification time */ -int desc_time_order = 0; /* flag marking contacts behind NAT */ int nat_flag = -1; /* if the TCP connection should be kept open */ @@ -145,7 +146,6 @@ {"default_q", INT_PARAM, &default_q }, {"append_branches", INT_PARAM, &append_branches }, {"case_sensitive", INT_PARAM, &case_sensitive }, - {"desc_time_order", INT_PARAM, &desc_time_order }, {"nat_flag", INT_PARAM, &nat_flag }, {"sip_natping_flag", INT_PARAM, &sip_natping_flag }, {"tcp_persistent_flag",INT_PARAM, &tcp_persistent_flag }, --- /usr/src/orig/openser-1.1.0-tls/modules/registrar/reg_mod.h 2006-04-13 18:44:04.000000000 +0200 +++ reg_mod.h 2006-10-04 15:51:00.000000000 +0200 @@ -54,7 +54,6 @@ extern qvalue_t default_q; extern int append_branches; extern int case_sensitive; -extern int desc_time_order; extern int nat_flag; extern int sip_natping_flag; extern int tcp_persistent_flag; --- /usr/src/orig/openser-1.1.0-tls/modules/registrar/save.c 2006-07-04 12:58:32.000000000 +0200 +++ save.c 2006-10-04 15:51:00.000000000 +0200 @@ -60,41 +60,6 @@ static int mem_only = 0; int_str rcv_avp; -void remove_cont(urecord_t* _r, ucontact_t* _c) -{ - if (_c->prev) { - _c->prev->next = _c->next; - if (_c->next) { - _c->next->prev = _c->prev; - } - } else { - _r->contacts = _c->next; - if (_c->next) { - _c->next->prev = 0; - } - } -} - - -void move_on_top(urecord_t* _r, ucontact_t* _c) -{ - ucontact_t* prev; - - if (!_r->contacts) return; - if (_c->prev == 0) return; - - prev = _c->prev; - - remove_cont(_r, _c); - - _c->next = _r->contacts; - _c->prev = 0; - - _r->contacts->prev = _c; - _r->contacts = _c; -} - - /* * Process request that contained a star, in that case, * we will remove all bindings with the given username @@ -670,10 +635,6 @@ "update contact\n"); goto error; } - - if (desc_time_order) { - move_on_top(_r, c); - } } } #ifdef USE_TCP