sr-dev April 2011

sr-dev@lists.kamailio.org

27 participants
271 discussions

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 4d5a004b2bb78fa8bf9bb4b603b085d04dee5519 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4d5a004… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 25 11:45:12 2011 +0200 rls(k): few fixes - string comparison that fails because sometimes one of the strings is '\0' terminated and the other never is. - fix for when some non-RLS SUBSCRIBEs are not identified as such. - fix for a small typo in an error diagnostic. - patch by Peter Dunkley (cherry picked from commit 2917d848a0ede8b7285a2f8414d43fcd4262f6e3) --- modules_k/rls/subscribe.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index f667379..c1efbd9 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -90,7 +90,7 @@ xmlNodePtr rls_get_by_service_uri(xmlDocPtr doc, str* uri) val = XMLNodeGetAttrContentByName(node, "uri"); if(val!=NULL) { - if((uri->len==strlen(val)) && (strcmp(val, uri->s)==0)) + if((uri->len==strlen(val)) && (strncmp(val, uri->s, uri->len)==0)) { xmlFree(val); return node; @@ -241,13 +241,17 @@ int rls_get_service_list(str *service_uri, str *user, str *domain, *service_node = rls_get_by_service_uri(xmldoc, service_uri); if(*service_node==NULL) { - LM_ERR("service uri %.*s not found in rl document for user" + LM_DBG("service uri %.*s not found in rl document for user" " sip:%.*s@%.*s\n", service_uri->len, service_uri->s, user->len, user->s, domain->len, domain->s); - goto error; + rootdoc = NULL; + if(xmldoc!=NULL) + xmlFreeDoc(xmldoc); + } + else + { + *rootdoc = xmldoc; } - - *rootdoc = xmldoc; rls_dbf.free_result(rls_db, result); if(xcapdoc!=NULL) @@ -621,7 +625,7 @@ int rls_handle_subscribe(struct sip_msg* msg, char* s1, char* s2) if(send_full_notify(&subs, service_node, subs.version, &subs.pres_uri, hash_code)<0) { - LM_ERR("failed sending full state sotify\n"); + LM_ERR("failed sending full state notify\n"); goto error; } /* send subscribe requests for all in the list */

13 years, 8 months

git:master: rls(k): few fixes

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2917d848a0ede8b7285a2f8414d43fcd4262f6e3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2917d84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 25 11:45:12 2011 +0200 rls(k): few fixes - string comparison that fails because sometimes one of the strings is '\0' terminated and the other never is. - fix for when some non-RLS SUBSCRIBEs are not identified as such. - fix for a small typo in an error diagnostic. - patch by Peter Dunkley --- modules_k/rls/subscribe.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index f667379..c1efbd9 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -90,7 +90,7 @@ xmlNodePtr rls_get_by_service_uri(xmlDocPtr doc, str* uri) val = XMLNodeGetAttrContentByName(node, "uri"); if(val!=NULL) { - if((uri->len==strlen(val)) && (strcmp(val, uri->s)==0)) + if((uri->len==strlen(val)) && (strncmp(val, uri->s, uri->len)==0)) { xmlFree(val); return node; @@ -241,13 +241,17 @@ int rls_get_service_list(str *service_uri, str *user, str *domain, *service_node = rls_get_by_service_uri(xmldoc, service_uri); if(*service_node==NULL) { - LM_ERR("service uri %.*s not found in rl document for user" + LM_DBG("service uri %.*s not found in rl document for user" " sip:%.*s@%.*s\n", service_uri->len, service_uri->s, user->len, user->s, domain->len, domain->s); - goto error; + rootdoc = NULL; + if(xmldoc!=NULL) + xmlFreeDoc(xmldoc); + } + else + { + *rootdoc = xmldoc; } - - *rootdoc = xmldoc; rls_dbf.free_result(rls_db, result); if(xcapdoc!=NULL) @@ -621,7 +625,7 @@ int rls_handle_subscribe(struct sip_msg* msg, char* s1, char* s2) if(send_full_notify(&subs, service_node, subs.version, &subs.pres_uri, hash_code)<0) { - LM_ERR("failed sending full state sotify\n"); + LM_ERR("failed sending full state notify\n"); goto error; } /* send subscribe requests for all in the list */

13 years, 8 months

[SR-Users] is $td.did avp a normal avp?

by Juha Heinanen

Juha Heinanen writes: > domain module sets $td.did at lookup_domain call. $td.did seems to be a > normal avp, because i can print its value with xlog by referring to it > as $avp(td.did). however, its value is gone at failure route, which > makes me suspect that $td.did is not really a normal avp. perhaps this has something to do with the flags of $td.did avp that seem to be flags = AVP_TRACK_TO | AVP_CLASS_DOMAIN i modified avpops avp_print() to print AVP with those flags and called it at the and of branch route and at the beginning of onerply route. i got to syslog Apr 23 14:25:52 sip /usr/sbin/sip-proxy[9862]: INFO: Printing AVPs in branch route Apr 23 14:25:52 sip /usr/sbin/sip-proxy[9862]: INFO: avpops [avpops_impl.c:1328]: p=0xb4797ca0, flags=0x0041 Apr 23 14:25:52 sip /usr/sbin/sip-proxy[9862]: INFO: avpops [avpops_impl.c:1332]: #011#011#011name=<lcr_id> Apr 23 14:25:52 sip /usr/sbin/sip-proxy[9862]: INFO: avpops [avpops_impl.c:1342]: #011#011#011val_int=<1> Apr 23 14:25:52 sip /usr/sbin/sip-proxy[9862]: INFO: avpops [avpops_impl.c:1328]: p=0xb4797c10, flags=0x0043 Apr 23 14:25:52 sip /usr/sbin/sip-proxy[9862]: INFO: avpops [avpops_impl.c:1332]: #011#011#011name=<did> Apr 23 14:25:52 sip /usr/sbin/sip-proxy[9862]: INFO: avpops [avpops_impl.c:1340]: #011#011#011val_str=<test.fi / 7> Apr 23 14:25:52 sip /usr/sbin/sip-proxy[9865]: INFO: Printing AVPs in onreply route this shows that $td.did was set at the end of branch route, but not at the beginning of onreply route, which seems to indicate that avps with flags AVP_TRACK_TO | AVP_CLASS_DOMAIN are not saved/restored with the transaction. i then tried to read tm module code and found this kind of line in t_hooks.c: set_avp_list(AVP_CLASS_DOMAIN | AVP_TRACK_TO, backup_dom_to ); which seems to indicate that those avps would be saved, but clearly that is not the case. i'll switch this to sr-dev list in the hope that there is someone left who knows what is going on and how also AVP_TRACK_TO | AVP_CLASS_DOMAIN avps can be saved/restored with the transaction? -- juha

13 years, 8 months

git:mariusbucur/dmq: improvements regarding the notification system

by Marius Ovidiu Bucur

Module: sip-router Branch: mariusbucur/dmq Commit: c70705c4bd589bbde8bdd5a7503b11d912f70f12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c70705c… Author: Marius Bucur <marius.bucur(a)1and1.ro> Committer: Marius Bucur <marius.bucur(a)1and1.ro> Date: Fri Apr 22 19:49:20 2011 +0300 improvements regarding the notification system --- modules_k/dmq/dmq.c | 35 +++++++++++++++--------- modules_k/dmq/dmq.h | 5 +++- modules_k/dmq/dmq_funcs.c | 53 ++++++++++++++++++++++++++++++++++--- modules_k/dmq/dmq_funcs.h | 2 +- modules_k/dmq/dmqnode.c | 22 +++++++++++---- modules_k/dmq/dmqnode.h | 7 +++- modules_k/dmq/message.c | 15 ++++++++++- modules_k/dmq/notification_peer.c | 39 ++++++++++++++++++++------- 8 files changed, 140 insertions(+), 38 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c70…

13 years, 8 months

git:master: modules_k/pv: Add s.replace transformation.

by Alex Hermann

Module: sip-router Branch: master Commit: 6526248ff5204286e832df0576f0403931777646 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6526248… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Mar 24 14:12:05 2011 +0100 modules_k/pv: Add s.replace transformation. Syntax: {s.replace,<search>,<replace>} Replaces every occurance of <search> with <replace>. Both parameters may contain pvars. --- modules_k/pv/pv_trans.c | 89 +++++++++++++++++++++++++++++++++++++++++++++- modules_k/pv/pv_trans.h | 3 +- 2 files changed, 89 insertions(+), 3 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index 4842a06..b60f529 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -69,8 +69,8 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, { int i, j, max; char *p, *s; - str st; - pv_value_t v; + str st, st2; + pv_value_t v, w; if(val==NULL || val->flags&PV_VAL_NULL) return -1; @@ -496,6 +496,61 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.len = j-1; break; + + case TR_S_REPLACE: + if(tp==NULL || tp->next==NULL) + { + LM_ERR("select invalid parameters\n"); + return -1; + } + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + + if(tp->type==TR_PARAM_STRING) + { + st = tp->v.s; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v)!=0 + || (!(v.flags&PV_VAL_STR)) || v.rs.len<=0) + { + LM_ERR("replace cannot get p1\n"); + return -1; + } + st = v.rs; + } + + if(tp->next->type==TR_PARAM_STRING) + { + st2 = tp->next->v.s; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->next->v.data, &w)!=0 + || (!(w.flags&PV_VAL_STR)) || w.rs.len<=0) + { + LM_ERR("replace cannot get p2\n"); + return -1; + } + st2 = w.rs; + } + + val->flags = PV_VAL_STR; + val->ri = 0; + + i = 0; + j = 0; + max = val->rs.len - st.len; + while (i < val->rs.len && j < TR_BUFFER_SIZE) { + if (i <= max && val->rs.s[i] == st.s[0] && strncmp(val->rs.s+i, st.s, st.len) == 0) { + strncpy(_tr_buffer+j, st2.s, st2.len); + i += st.len; + j += st2.len; + } else { + _tr_buffer[j++] = val->rs.s[i++]; + } + } + val->rs.s = _tr_buffer; + val->rs.len = j; + break; + case TR_S_TIMEFORMAT: if(tp==NULL) { @@ -1483,6 +1538,36 @@ char* tr_parse_string(str* in, trans_t *t) goto error; } goto done; + } else if(name.len==7 && strncasecmp(name.s, "replace", 7)==0) { + t->subtype = TR_S_REPLACE; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid replace transformation: %.*s!\n", in->len, in->s); + goto error; + } + p++; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid replace transformation: %.*s!\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params->next = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid replace transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/modules_k/pv/pv_trans.h b/modules_k/pv/pv_trans.h index 222c09e..0938ddc 100644 --- a/modules_k/pv/pv_trans.h +++ b/modules_k/pv/pv_trans.h @@ -39,7 +39,8 @@ enum _tr_s_subtype { TR_S_SELECT, TR_S_ENCODEHEXA, TR_S_DECODEHEXA, TR_S_ESCAPECOMMON, TR_S_UNESCAPECOMMON, TR_S_ESCAPEUSER, TR_S_UNESCAPEUSER, TR_S_ESCAPEPARAM, TR_S_UNESCAPEPARAM, TR_S_TOLOWER, TR_S_TOUPPER, - TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_TIMEFORMAT + TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, + TR_S_TIMEFORMAT }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

13 years, 8 months

git:master: modules_k/pv: Add s.ftime transformation. Will format the epoch in the pv by the format in the parameter. Uses standard strftime formatting.

by Alex Hermann

Module: sip-router Branch: master Commit: 29318c4636b01fbaa0d119d9bdd2926adc3817de URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=29318c4… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Fri Mar 11 16:52:18 2011 +0100 modules_k/pv: Add s.ftime transformation. Will format the epoch in the pv by the format in the parameter. Uses standard strftime formatting. example: $(TS{s.ftime,%Y-%m-%d %H:%M:%S}) --- modules_k/pv/pv_trans.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++ modules_k/pv/pv_trans.h | 2 +- 2 files changed, 59 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index 476b5c0..4842a06 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -496,6 +496,43 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.len = j-1; break; + case TR_S_TIMEFORMAT: + if(tp==NULL) + { + LM_ERR("timeformat invalid parameters\n"); + return -1; + } + if(!(val->flags&PV_VAL_INT) && (str2int(&val->rs, (unsigned int*) &val->ri)!=0)) + { + LM_ERR("value is not numeric\n"); + return -1; + } + if(tp->type==TR_PARAM_STRING) + { + st = tp->v.s; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v)!=0 + || (!(v.flags&PV_VAL_STR)) || v.rs.len<=0) + { + LM_ERR("timeformat cannot get p1\n"); + return -1; + } + st = v.rs; + } + s = pkg_malloc(st.len + 1); + if (s==NULL) + { + LM_ERR("no more pkg memory\n"); + return -1; + } + memcpy(s, st.s, st.len); + s[st.len] = '\0'; + val->rs.len = strftime(_tr_buffer, TR_BUFFER_SIZE-1, s, localtime((time_t*) &val->ri)); + pkg_free(s); + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + break; + default: LM_ERR("unknown subtype %d\n", subtype); @@ -1212,6 +1249,7 @@ char* tr_parse_string(str* in, trans_t *t) { char *p; char *p0; + char *ps; str name; str s; pv_spec_t *spec = NULL; @@ -1425,6 +1463,26 @@ char* tr_parse_string(str* in, trans_t *t) goto error; } goto done; + } else if(name.len==5 && strncasecmp(name.s, "ftime", 5)==0) { + t->subtype = TR_S_TIMEFORMAT; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid ftime transformation: %.*s!\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid ftime transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/modules_k/pv/pv_trans.h b/modules_k/pv/pv_trans.h index 1e601d8..222c09e 100644 --- a/modules_k/pv/pv_trans.h +++ b/modules_k/pv/pv_trans.h @@ -39,7 +39,7 @@ enum _tr_s_subtype { TR_S_SELECT, TR_S_ENCODEHEXA, TR_S_DECODEHEXA, TR_S_ESCAPECOMMON, TR_S_UNESCAPECOMMON, TR_S_ESCAPEUSER, TR_S_UNESCAPEUSER, TR_S_ESCAPEPARAM, TR_S_UNESCAPEPARAM, TR_S_TOLOWER, TR_S_TOUPPER, - TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT + TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_TIMEFORMAT }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

13 years, 8 months

git:master: modules_k/pv: allow spaces in transformation parameters

by Alex Hermann

Module: sip-router Branch: master Commit: ff5d5e143fd8ac1c0a269077d5fa0c6b36873472 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff5d5e1… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Fri Mar 11 16:51:41 2011 +0100 modules_k/pv: allow spaces in transformation parameters --- modules_k/pv/pv_trans.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index eb8f405..476b5c0 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -1180,7 +1180,7 @@ int tr_eval_tobody(struct sip_msg *msg, tr_param_t *tp, int subtype, _tp->v.data = (void*)_spec; \ } else { /* string */ \ _ps = _p; \ - while(is_in_str(_p, _in) && *_p!=' ' && *_p!='\t' && *_p!='\n' \ + while(is_in_str(_p, _in) && *_p!='\t' && *_p!='\n' \ && *_p!=TR_PARAM_MARKER && *_p!=TR_RBRACKET) \ _p++; \ if(*_p=='\0') \

13 years, 8 months

git:master: modules_k/pv: remove useless loop from transformation parameter parsing.

by Alex Hermann

Module: sip-router Branch: master Commit: f94e770b265276cba250ae37349c31cbe75b48a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f94e770… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Fri Mar 11 16:50:30 2011 +0100 modules_k/pv: remove useless loop from transformation parameter parsing. The while loop at the beginning of the macro already skips over whitespace. --- modules_k/pv/pv_trans.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index 35c7fe2..eb8f405 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -1179,8 +1179,6 @@ int tr_eval_tobody(struct sip_msg *msg, tr_param_t *tp, int subtype, _tp->type = TR_PARAM_SPEC; \ _tp->v.data = (void*)_spec; \ } else { /* string */ \ - while(is_in_str(_p, _in) && (*_p==' ' || *_p=='\t' || *_p=='\n')) \ - _p++; \ _ps = _p; \ while(is_in_str(_p, _in) && *_p!=' ' && *_p!='\t' && *_p!='\n' \ && *_p!=TR_PARAM_MARKER && *_p!=TR_RBRACKET) \

13 years, 8 months

git:master: core/xavp: Consolidate duplicate code. No changes to public interfaces.

by Alex Hermann

Module: sip-router Branch: master Commit: 14fb4aac10bf9b6cf70d9b7bf6384f3eec2dd639 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14fb4aa… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Fri Mar 25 12:17:46 2011 +0100 core/xavp: Consolidate duplicate code. No changes to public interfaces. --- xavp.c | 241 +++++++++++++++++++++++++--------------------------------------- 1 files changed, 93 insertions(+), 148 deletions(-) diff --git a/xavp.c b/xavp.c index aac6d21..265729e 100644 --- a/xavp.c +++ b/xavp.c @@ -37,6 +37,11 @@ static sr_xavp_t *_xavp_list_head = 0; /*! Pointer to XAVP current list */ static sr_xavp_t **_xavp_list_crt = &_xavp_list_head; +/*! Helper functions */ +static sr_xavp_t *xavp_get_internal(str *name, sr_xavp_t **list, int idx, sr_xavp_t **prv); +static int xavp_rm_internal(str *name, sr_xavp_t **head, int idx); + + void xavp_shm_free(void *p) { shm_free(p); @@ -74,13 +79,15 @@ void xavp_free_unsafe(sr_xavp_t *xa) shm_free_unsafe(xa); } -sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list) +static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) { - sr_xavp_t *avp=0; + sr_xavp_t *avp; int size; + unsigned int id; if(name==NULL || name->s==NULL || val==NULL) return NULL; + id = get_hash1_raw(name->s, name->len); size = sizeof(sr_xavp_t) + name->len + 1; if(val->type == SR_XTYPE_STR) @@ -89,7 +96,7 @@ sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list) if(avp==NULL) return NULL; memset(avp, 0, size); - avp->id = get_hash1_raw(name->s, name->len); + avp->id = id; avp->name.s = (char*)avp + sizeof(sr_xavp_t); memcpy(avp->name.s, name->s, name->len); avp->name.s[name->len] = '\0'; @@ -102,6 +109,19 @@ sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list) avp->val.v.s.s[val->v.s.len] = '\0'; avp->val.v.s.len = val->v.s.len; } + + return avp; +} + +sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list) +{ + sr_xavp_t *avp=0; + + avp = xavp_new_value(name, val); + if (avp==NULL) + return NULL; + + /* Prepend new value to the list */ if(list) { avp->next = *list; *list = avp; @@ -115,99 +135,39 @@ sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list) sr_xavp_t *xavp_set_value(str *name, int idx, sr_xval_t *val, sr_xavp_t **list) { - sr_xavp_t *avp=0; + sr_xavp_t *avp; + sr_xavp_t *cur; sr_xavp_t *prv=0; - sr_xavp_t *tmp=0; - unsigned int id; - int size; - int n=0; - if(name==NULL || name->s==NULL || val==NULL) + if(val==NULL) return NULL; - id = get_hash1_raw(name->s, name->len); - if(list) - avp = *list; - else - avp=*_xavp_list_crt; - while(avp) - { - if(avp->id==id && avp->name.len==name->len - && strncmp(avp->name.s, name->s, name->len)==0) - { - if(idx==n) - break; - n++; - } - prv = avp; - avp=avp->next; - } - if(avp==NULL) + /* Find the current value */ + cur = xavp_get_internal(name, list, idx, &prv); + if(cur==NULL) return NULL; - tmp = avp; - size = sizeof(sr_xavp_t) + name->len + 1; - if(val->type == SR_XTYPE_STR) - size += val->v.s.len + 1; - avp = (sr_xavp_t*)shm_malloc(size); - if(avp==NULL) + avp = xavp_new_value(name, val); + if (avp==NULL) return NULL; - memset(avp, 0, size); - avp->id = get_hash1_raw(name->s, name->len); - avp->name.s = (char*)avp + sizeof(sr_xavp_t); - memcpy(avp->name.s, name->s, name->len); - avp->name.s[name->len] = '\0'; - avp->name.len = name->len; - memcpy(&avp->val, val, sizeof(sr_xval_t)); - if(val->type == SR_XTYPE_STR) - { - avp->val.v.s.s = avp->name.s + avp->name.len + 1; - memcpy(avp->val.v.s.s, val->v.s.s, val->v.s.len); - avp->val.v.s.s[val->v.s.len] = '\0'; - avp->val.v.s.len = val->v.s.len; - } - avp->next = tmp->next; - if(prv) { - prv->next = avp; - } else { - if(list) { - *list = avp; - } else { - *_xavp_list_crt = avp; - } - } - xavp_free(tmp); - - return avp; -} - -sr_xavp_t *xavp_get(str *name, sr_xavp_t *start) -{ - sr_xavp_t *avp=0; - unsigned int id; - if(name==NULL || name->s==NULL) - return NULL; - id = get_hash1_raw(name->s, name->len); - - if(start) - avp = start; + /* Replace the current value with the new */ + avp->next = cur->next; + if(prv) + prv->next = avp; + else if(list) + *list = avp; else - avp=*_xavp_list_crt; - while(avp) - { - if(avp->id==id && avp->name.len==name->len - && strncmp(avp->name.s, name->s, name->len)==0) - return avp; - avp=avp->next; - } + *_xavp_list_crt = avp; - return NULL; + xavp_free(cur); + + return avp; } -sr_xavp_t *xavp_get_by_index(str *name, int idx, sr_xavp_t **start) +static sr_xavp_t *xavp_get_internal(str *name, sr_xavp_t **list, int idx, sr_xavp_t **prv) { - sr_xavp_t *avp=0; + sr_xavp_t *avp; unsigned int id; int n = 0; @@ -215,10 +175,10 @@ sr_xavp_t *xavp_get_by_index(str *name, int idx, sr_xavp_t **start) return NULL; id = get_hash1_raw(name->s, name->len); - if(start) - avp = *start; + if(list && *list) + avp = *list; else - avp=*_xavp_list_crt; + avp = *_xavp_list_crt; while(avp) { if(avp->id==id && avp->name.len==name->len @@ -228,16 +188,26 @@ sr_xavp_t *xavp_get_by_index(str *name, int idx, sr_xavp_t **start) return avp; n++; } - avp=avp->next; + if(prv) + *prv = avp; + avp = avp->next; } - return NULL; } +sr_xavp_t *xavp_get(str *name, sr_xavp_t *start) +{ + return xavp_get_internal(name, &start, 0, NULL); +} + +sr_xavp_t *xavp_get_by_index(str *name, int idx, sr_xavp_t **start) +{ + return xavp_get_internal(name, start, idx, NULL); +} sr_xavp_t *xavp_get_next(sr_xavp_t *start) { - sr_xavp_t *avp=0; + sr_xavp_t *avp; if(start==NULL) return NULL; @@ -257,7 +227,7 @@ sr_xavp_t *xavp_get_next(sr_xavp_t *start) int xavp_rm(sr_xavp_t *xa, sr_xavp_t **head) { - sr_xavp_t *avp=0; + sr_xavp_t *avp; sr_xavp_t *prv=0; if(head!=NULL) @@ -271,11 +241,10 @@ int xavp_rm(sr_xavp_t *xa, sr_xavp_t **head) { if(prv) prv->next=avp->next; + else if(head!=NULL) + *head = avp->next; else - if(head!=NULL) - *head = avp->next; - else - *_xavp_list_crt = avp->next; + *_xavp_list_crt = avp->next; xavp_free(avp); return 1; } @@ -284,14 +253,19 @@ int xavp_rm(sr_xavp_t *xa, sr_xavp_t **head) return 0; } - -int xavp_rm_by_name(str *name, int all, sr_xavp_t **head) +/* Remove xavps + * idx: <0 remove all xavps with the same name + * >=0 remove only the specified index xavp + * Returns number of xavps that were deleted + */ +static int xavp_rm_internal(str *name, sr_xavp_t **head, int idx) { - sr_xavp_t *avp=0; - sr_xavp_t *foo=0; + sr_xavp_t *avp; + sr_xavp_t *foo; sr_xavp_t *prv=0; - unsigned int id = 0; + unsigned int id; int n=0; + int count=0; if(name==NULL || name->s==NULL) return 0; @@ -300,7 +274,7 @@ int xavp_rm_by_name(str *name, int all, sr_xavp_t **head) if(head!=NULL) avp = *head; else - avp=*_xavp_list_crt; + avp = *_xavp_list_crt; while(avp) { foo = avp; @@ -308,72 +282,43 @@ int xavp_rm_by_name(str *name, int all, sr_xavp_t **head) if(foo->id==id && foo->name.len==name->len && strncmp(foo->name.s, name->s, name->len)==0) { - if(prv!=NULL) - prv->next=foo->next; - else - if(head!=NULL) + if(idx<0 || idx==n) + { + if(prv!=NULL) + prv->next=foo->next; + else if(head!=NULL) *head = foo->next; else *_xavp_list_crt = foo->next; - xavp_free(foo); + xavp_free(foo); + if(idx>=0) + return 1; + count++; + } n++; - if(all==0) - return n; } else { prv = foo; } } - return n; + return count; } -int xavp_rm_by_index(str *name, int idx, sr_xavp_t **head) +int xavp_rm_by_name(str *name, int all, sr_xavp_t **head) { - sr_xavp_t *avp=0; - sr_xavp_t *foo=0; - sr_xavp_t *prv=0; - unsigned int id = 0; - int n=0; + return xavp_rm_internal(name, head, -1*all); +} - if(name==NULL || name->s==NULL) - return 0; - if(idx<0) +int xavp_rm_by_index(str *name, int idx, sr_xavp_t **head) +{ + if (idx<0) return 0; - - id = get_hash1_raw(name->s, name->len); - if(head!=NULL) - avp = *head; - else - avp=*_xavp_list_crt; - while(avp) - { - foo = avp; - avp=avp->next; - if(foo->id==id && foo->name.len==name->len - && strncmp(foo->name.s, name->s, name->len)==0) - { - if(idx==n) - { - if(prv!=NULL) - prv->next=foo->next; - else - if(head!=NULL) - *head = foo->next; - else - *_xavp_list_crt = foo->next; - xavp_free(foo); - return 1; - } - n++; - } - prv = foo; - } - return 0; + return xavp_rm_internal(name, head, idx); } int xavp_count(str *name, sr_xavp_t **start) { - sr_xavp_t *avp=0; + sr_xavp_t *avp; unsigned int id; int n = 0;

13 years, 8 months

git:master: core/xavps: Fix assignment to indexed subname.

by Alex Hermann

Module: sip-router Branch: master Commit: 4563f6949d2beabd0d9411dee1e93216f5fef8f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4563f69… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Mar 24 18:50:23 2011 +0100 core/xavps: Fix assignment to indexed subname. $xavp(name1[idx1]=>name2[idx2]) When idx2 is used, the current value is now replaced instead of ignored. --- xavp.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/xavp.c b/xavp.c index 622c058..aac6d21 100644 --- a/xavp.c +++ b/xavp.c @@ -136,7 +136,7 @@ sr_xavp_t *xavp_set_value(str *name, int idx, sr_xval_t *val, sr_xavp_t **list) && strncmp(avp->name.s, name->s, name->len)==0) { if(idx==n) - return avp; + break; n++; } prv = avp; @@ -166,16 +166,13 @@ sr_xavp_t *xavp_set_value(str *name, int idx, sr_xval_t *val, sr_xavp_t **list) avp->val.v.s.s[val->v.s.len] = '\0'; avp->val.v.s.len = val->v.s.len; } - if(prv) - { - avp->next = prv->next; - prv->next = avp; + avp->next = tmp->next; + if(prv) { + prv->next = avp; } else { if(list) { - avp->next = *list; *list = avp; } else { - avp->next = *_xavp_list_crt; *_xavp_list_crt = avp; } }

13 years, 8 months

← Newer
1
...
4
5
6
7
8
9
10
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2011