sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
346 discussions

git:master: modules: sipcapture Performance improvements for HEP package handling

by Marius Zbihlei

Module: sip-router Branch: master Commit: 99266bb7be2724100e48fa95c672df77f27069d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99266bb… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Apr 5 13:59:58 2012 +0300 modules:sipcapture Performance improvements for HEP package handling Copying the SIP Payload over the HEP header caused excesive CPU Usage (arount 18% of kamailio's total). The solution is to replace the HEP info with \n, which at beginning of the message are ignored by the parser. Also, storing the message into DB is done taking into consideration the computed offset. Performance data was computed using valgrind's callgrind. --- modules/sipcapture/sipcapture.c | 69 +++++++++++++++++++++++++-------------- 1 files changed, 44 insertions(+), 25 deletions(-) diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 506c215..a8c5d01 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -202,6 +202,7 @@ int *capture_on_flag = NULL; int db_insert_mode = 0; int promisc_on = 0; int bpf_on = 0; +int hep_offset = 0; //this stores the hep header added offset str raw_socket_listen = { 0, 0 }; str raw_interface = { 0, 0 }; @@ -627,7 +628,7 @@ int hep_msg_received(void *data) int offset = 0, hl; struct hep_hdr *heph; struct ip_addr dst_ip, src_ip; - char *hep_payload, *end, *p, *hep_ip; + char *hep_payload, *end, *hep_ip; struct hep_iphdr *hepiph = NULL; struct hep_timehdr* heptime_tmp = NULL; @@ -641,7 +642,9 @@ int hep_msg_received(void *data) LOG(L_ERR, "ERROR: sipcapture:hep_msg_received HEP is not enabled\n"); return -1; } - + + hep_offset = 0; + srevp = (void**)data; buf = (char *)srevp[0]; @@ -649,10 +652,10 @@ int hep_msg_received(void *data) ri = (struct receive_info *)srevp[2]; - hl = offset = sizeof(struct hep_hdr); + hl = hep_offset = sizeof(struct hep_hdr); end = buf + *len; - if (unlikely(*len<offset)) { - LOG(L_ERR, "ERROR: sipcapture:hep_msg_received len less than offset [%i] vs [%i]\n", *len, offset); + if (unlikely(*len<hep_offset)) { + LOG(L_ERR, "ERROR: sipcapture:hep_msg_received len less than offset [%i] vs [%i]\n", *len, hep_offset); return -1; } @@ -701,13 +704,13 @@ int hep_msg_received(void *data) switch(heph->hp_f){ case AF_INET: - offset+=sizeof(struct hep_iphdr); + hep_offset+=sizeof(struct hep_iphdr); hepiph = (struct hep_iphdr*) hep_ip; break; #ifdef USE_IPV6 case AF_INET6: - offset+=sizeof(struct hep_ip6hdr); + hep_offset+=sizeof(struct hep_ip6hdr); hepip6h = (struct hep_ip6hdr*) hep_ip; break; #endif /* USE_IPV6 */ @@ -715,7 +718,7 @@ int hep_msg_received(void *data) } /* VOIP payload */ - hep_payload = buf + offset; + hep_payload = buf + hep_offset; if (unlikely(hep_payload>end)){ LOG(L_ERR,"hep_payload is over buf+len\n"); @@ -762,9 +765,12 @@ int hep_msg_received(void *data) ri->dst_port = ntohs(heph->hp_dport); /* cut off the offset */ - *len -= offset; - p = buf + offset; - memmove(buf, p, BUF_SIZE+1); + /* + * *len -= offset; + * p = buf + offset; + * memmove(buf, p, BUF_SIZE+1); + */ + memset(buf, '\n', offset); /* the parser will ignore the starting \n no need to do expensive memmove */ return 0; } @@ -785,7 +791,9 @@ static int sip_capture_store(struct _sipcapture_object *sco) { db_key_t db_keys[NR_KEYS]; db_val_t db_vals[NR_KEYS]; - + + str tmp; + if(sco==NULL) { LM_DBG("invalid parameter\n"); @@ -800,9 +808,9 @@ static int sip_capture_store(struct _sipcapture_object *sco) db_keys[1] = &date_column; db_vals[1].type = DB1_DATETIME; db_vals[1].nul = 0; - db_vals[1].val.time_val = time(NULL); + db_vals[1].val.time_val = time(NULL); - db_keys[2] = &micro_ts_column; + db_keys[2] = &micro_ts_column; db_vals[2].type = DB1_BIGINT; db_vals[2].nul = 0; db_vals[2].val.ll_val = sco->tmstamp; @@ -810,32 +818,32 @@ static int sip_capture_store(struct _sipcapture_object *sco) db_keys[3] = &method_column; db_vals[3].type = DB1_STR; db_vals[3].nul = 0; - db_vals[3].val.str_val = sco->method; + db_vals[3].val.str_val = sco->method; db_keys[4] = &reply_reason_column; db_vals[4].type = DB1_STR; db_vals[4].nul = 0; - db_vals[4].val.str_val = sco->reply_reason; + db_vals[4].val.str_val = sco->reply_reason; db_keys[5] = &ruri_column; db_vals[5].type = DB1_STR; db_vals[5].nul = 0; - db_vals[5].val.str_val = sco->ruri; + db_vals[5].val.str_val = sco->ruri; db_keys[6] = &ruri_user_column; db_vals[6].type = DB1_STR; db_vals[6].nul = 0; - db_vals[6].val.str_val = sco->ruri_user; + db_vals[6].val.str_val = sco->ruri_user; db_keys[7] = &from_user_column; db_vals[7].type = DB1_STR; db_vals[7].nul = 0; - db_vals[7].val.str_val = sco->from_user; + db_vals[7].val.str_val = sco->from_user; db_keys[8] = &from_tag_column; db_vals[8].type = DB1_STR; db_vals[8].nul = 0; - db_vals[8].val.str_val = sco->from_tag; + db_vals[8].val.str_val = sco->from_tag; db_keys[9] = &to_user_column; db_vals[9].type = DB1_STR; @@ -912,7 +920,7 @@ static int sip_capture_store(struct _sipcapture_object *sco) db_vals[23].nul = 0; db_vals[23].val.str_val = sco->source_ip; - db_keys[24] = &source_port_column; + db_keys[24] = &source_port_column; db_vals[24].type = DB1_INT; db_vals[24].nul = 0; db_vals[24].val.int_val = sco->source_port; @@ -922,7 +930,7 @@ static int sip_capture_store(struct _sipcapture_object *sco) db_vals[25].nul = 0; db_vals[25].val.str_val = sco->destination_ip; - db_keys[26] = &dest_port_column; + db_keys[26] = &dest_port_column; db_vals[26].type = DB1_INT; db_vals[26].nul = 0; db_vals[26].val.int_val = sco->destination_port; @@ -932,7 +940,7 @@ static int sip_capture_store(struct _sipcapture_object *sco) db_vals[27].nul = 0; db_vals[27].val.str_val = sco->contact_ip; - db_keys[28] = &contact_port_column; + db_keys[28] = &contact_port_column; db_vals[28].type = DB1_INT; db_vals[28].nul = 0; db_vals[28].val.int_val = sco->contact_port; @@ -975,8 +983,19 @@ static int sip_capture_store(struct _sipcapture_object *sco) db_keys[36] = &msg_column; db_vals[36].type = DB1_BLOB; db_vals[36].nul = 0; - db_vals[36].val.blob_val = sco->msg; - + + if(hep_offset>0){ + /* if message was captured via hep skip trailing empty spaces(newlines) from the start of the buffer */ + tmp.s = sco->msg.s + hep_offset; + tmp.len = sco->msg.len - hep_offset; + hep_offset = 0; + } else { + tmp.s = sco->msg.s; + tmp.len = sco->msg.len; + } + + db_vals[36].val.blob_val = tmp; + LM_DBG("homer table: [%.*s]\n", table_name.len, table_name.s); db_funcs.use_table(db_con, &table_name);

12 years, 7 months

Problem with xpath updates of XCAP documents

by Peter Dunkley

Hi, I have been experimenting with uploading, and modifying existing, XCAP documents. I have been trying out the example from RFC 4827 and I can't get it to work with Kamailio. To upload the document (this works) I use the command: curl --digest -u 111:111 -T pidf.xml -X PUT http://192.168.0.130:5060/xcap-root/pidf-manipulation/users/sip:111@mydomai… To modify the document (this doesn't work) I use the command: curl --digest -u 111:111 -T pidf_modify.xml -H "Content-Type: application/xcap-el+xml" -X PUT http://192.168.0.130:5060/xcap-root/pidf-manipulation/users/sip:111@mydomai…'x8eg92n'%5d/note When I try to modify the document I get the error: "Apr 4 17:12:08 pd-laptop-linux kamailio[16862]: ERROR: xcap_server [xcap_server.c:596]: no new content" I went through the XCAP server code and added some debug and found that the check on xcap_misc.c:491 is succeeding (which means "no selection for xpath parent expression") and the document is not being changed. Also, from my limited understanding of XPath and libxml2, I would have expected the code path which should have been followed to go through the else clause of the conditional on xcap_misc.c:468 - which means I don't think that the xcaps_xpath_set() function is doing the right thing at all. Is there anyone here that is more familiar with libxml2 that can give me any pointers here. As far as I can tell the XCAP server code looks OK to me, and I believe the documents (attached) and my XCAP queries are correct as well. Thanks, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

12 years, 7 months

git:master: modules_k/xcap_server: Fix to handling of pidf-manipulation documents

by Peter Dunkley

Module: sip-router Branch: master Commit: 8475fa8c6208ae3dad46f163f41704c097248d94 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8475fa8… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 4 17:08:40 2012 +0100 modules_k/xcap_server: Fix to handling of pidf-manipulation documents --- modules_k/xcap_server/xcap_server.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c index 9580e53..ff25967 100644 --- a/modules_k/xcap_server/xcap_server.c +++ b/modules_k/xcap_server/xcap_server.c @@ -460,23 +460,24 @@ error: return -1; } -static str xcaps_str_empty = {"", 0}; -static str xcaps_str_ok = {"OK", 2}; -static str xcaps_str_srverr = {"Server error", 12}; -static str xcaps_str_notfound = {"Not found", 9}; -static str xcaps_str_precon = {"Precondition Failed", 19}; -static str xcaps_str_notmod = {"Not Modified", 12}; -static str xcaps_str_appxml = {"application/xml", 15}; -static str xcaps_str_apprlxml = {"application/resource-lists+xml", 30}; -static str xcaps_str_apprsxml = {"application/rls-services+xml", 28}; +static str xcaps_str_empty = {"", 0}; +static str xcaps_str_ok = {"OK", 2}; +static str xcaps_str_srverr = {"Server error", 12}; +static str xcaps_str_notfound = {"Not found", 9}; +static str xcaps_str_precon = {"Precondition Failed", 19}; +static str xcaps_str_notmod = {"Not Modified", 12}; +static str xcaps_str_appxml = {"application/xml", 15}; +static str xcaps_str_apprlxml = {"application/resource-lists+xml", 30}; +static str xcaps_str_apprsxml = {"application/rls-services+xml", 28}; #if 0 -static str xcaps_str_nocontent = {"No content", 10}; -static str xcaps_str_appxcxml = {"application/xcap-caps+xml", 25}; +static str xcaps_str_nocontent = {"No content", 10}; +static str xcaps_str_appxcxml = {"application/xcap-caps+xml", 25}; static str xcaps_str_appsexml = {"application/vnd.oma.search+xml", 30}; #endif -static str xcaps_str_appapxml = {"application/auth-policy+xml", 27}; +static str xcaps_str_appapxml = {"application/auth-policy+xml", 27}; static str xcaps_str_appupxml = {"application/vnd.oma.user-profile+xml", 36}; static str xcaps_str_apppcxml = {"application/vnd.oma.pres-content+xml", 36}; +static str xcaps_str_apppdxml = {"application/pidf+xml", 20}; /** @@ -946,6 +947,8 @@ static int w_xcaps_get(sip_msg_t* msg, char* puri, char* ppath) ctype = &xcaps_str_appupxml; else if(xuri.type==PRES_CONTENT) ctype = &xcaps_str_apppcxml; + else if(xuri.type==PIDF_MANIPULATION) + ctype = &xcaps_str_apppdxml; xcaps_send_reply(msg, 200, &xcaps_str_ok, &etag, ctype, &body); } else {

12 years, 7 months

git:master: htable(k): Added 'updateexpire' parameter to the definition of an

by Alex Balashov

Module: sip-router Branch: master Commit: aa5a8463c835c94d1c8cba348791e13c64bcf4f2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa5a846… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Alex Balashov <abalashov(a)evaristesys.com> Date: Wed Apr 4 10:48:03 2012 -0400 htable(k): Added 'updateexpire' parameter to the definition of an htable. It permits one to change whether updating a value stored in the htable resets its time until expiration. Its default value is 1, to preserve existing behaviour. However, if set to 0, updating a value will have no effect on how soon it will expire. --- modules_k/htable/README | 10 ++++++++++ modules_k/htable/doc/htable.xml | 5 +++++ modules_k/htable/doc/htable_admin.xml | 5 +++++ modules_k/htable/ht_api.c | 23 ++++++++++++++++++----- modules_k/htable/ht_api.h | 3 ++- 5 files changed, 40 insertions(+), 6 deletions(-) diff --git a/modules_k/htable/README b/modules_k/htable/README index 45f2684..aa98300 100644 --- a/modules_k/htable/README +++ b/modules_k/htable/README @@ -11,6 +11,12 @@ Elena-Ramona Modroiu <ramona(a)rosdev.ro> +Edited by + +Alex Balashov + + <abalashov(a)evaristesys.com> + Copyright © 2008-2011 http://www.asipto.com __________________________________________________________________ @@ -278,6 +284,10 @@ if(is_present_hf("Authorization")) table). * initval - the integer value to be returned instead of $null when a requested key is not set. + * updateexpire - if set to 1 (default), the time until expiration of + an item is reset when that item is updated. Certain uses of htable + may dictate that updates should not reset the expiration timeout, + however, in which case this attribute can be set to 0. Default value is NULL. diff --git a/modules_k/htable/doc/htable.xml b/modules_k/htable/doc/htable.xml index 8081252..9404084 100644 --- a/modules_k/htable/doc/htable.xml +++ b/modules_k/htable/doc/htable.xml @@ -29,6 +29,11 @@ <surname>Modroiu</surname> <email>ramona(a)rosdev.ro</email> </editor> + <editor> + <firstname>Alex</firstname> + <surname>Balashov</surname> + <email>abalashov(a)evaristesys.com</email> + </editor> </authorgroup> <copyright> <year>2008-2011</year> diff --git a/modules_k/htable/doc/htable_admin.xml b/modules_k/htable/doc/htable_admin.xml index a9ff4ba..09ee23c 100644 --- a/modules_k/htable/doc/htable_admin.xml +++ b/modules_k/htable/doc/htable_admin.xml @@ -267,6 +267,11 @@ if(is_present_hf("Authorization")) instead of $null when a requested key is not set. </para> </listitem> + <listitem> + <para> + <emphasis>updateexpire</emphasis> - if set to 1 (default), the time until expiration of an item is reset when that item is updated. Certain uses of htable may dictate that updates should not reset the expiration timeout, however, in which case this attribute can be set to 0. + </para> + </listitem> </itemizedlist> <para> <emphasis> diff --git a/modules_k/htable/ht_api.c b/modules_k/htable/ht_api.c index ed4da81..24ae0b0 100644 --- a/modules_k/htable/ht_api.c +++ b/modules_k/htable/ht_api.c @@ -217,7 +217,7 @@ ht_t* ht_get_table(str *name) } int ht_add_table(str *name, int autoexp, str *dbtable, int size, int dbmode, - int itype, int_str *ival) + int itype, int_str *ival, int updateexpire) { unsigned int htid; ht_t *ht; @@ -252,6 +252,7 @@ int ht_add_table(str *name, int autoexp, str *dbtable, int size, int dbmode, else ht->htsize = 1<<size; ht->htid = htid; ht->htexpire = autoexp; + ht->updateexpire = updateexpire; ht->name = *name; if(dbtable!=NULL && dbtable->len>0) ht->dbtable = *dbtable; @@ -387,7 +388,9 @@ int ht_set_cell(ht_t *ht, str *name, int type, int_str *val, int mode) it->value.s.len = val->s.len; memcpy(it->value.s.s, val->s.s, val->s.len); it->value.s.s[it->value.s.len] = '\0'; - it->expire = now + ht->htexpire; + + if(ht->updateexpire) + it->expire = now + ht->htexpire; } else { /* new */ cell = ht_cell_new(name, type, val, hid); @@ -411,7 +414,9 @@ int ht_set_cell(ht_t *ht, str *name, int type, int_str *val, int mode) } else { it->flags &= ~AVP_VAL_STR; it->value.n = val->n; - it->expire = now + ht->htexpire; + + if(ht->updateexpire) + it->expire = now + ht->htexpire; } if(mode) lock_release(&ht->entries[idx].lock); return 0; @@ -438,7 +443,9 @@ int ht_set_cell(ht_t *ht, str *name, int type, int_str *val, int mode) ht_cell_free(it); } else { it->value.n = val->n; - it->expire = now + ht->htexpire; + + if(ht->updateexpire) + it->expire = now + ht->htexpire; } if(mode) lock_release(&ht->entries[idx].lock); return 0; @@ -717,6 +724,7 @@ int ht_table_spec(char *spec) unsigned int autoexpire = 0; unsigned int size = 4; unsigned int dbmode = 0; + unsigned int updateexpire = 1; str in; str tok; param_t *pit=NULL; @@ -768,11 +776,16 @@ int ht_table_spec(char *spec) itype = PV_VAL_INT; LM_DBG("htable [%.*s] - initval [%d]\n", name.len, name.s, ival.n); + } else if(pit->name.len == 12 && strncmp(pit->name.s, "updateexpire", 12) == 0) { + if(str2int(&tok, &updateexpire) != 0) + goto error; + + LM_DBG("htable [%.*s] - updateexpire [%u]\n", name.len, name.s, updateexpire); } else { goto error; } } return ht_add_table(&name, autoexpire, &dbtable, size, dbmode, - itype, &ival); + itype, &ival, updateexpire); error: LM_ERR("invalid htable parameter [%.*s]\n", in.len, in.s); diff --git a/modules_k/htable/ht_api.h b/modules_k/htable/ht_api.h index 831267e..9a039be 100644 --- a/modules_k/htable/ht_api.h +++ b/modules_k/htable/ht_api.h @@ -57,6 +57,7 @@ typedef struct _ht int dbmode; int flags; int_str initval; + int updateexpire; unsigned int htsize; ht_entry_t *entries; struct _ht *next; @@ -69,7 +70,7 @@ typedef struct _ht_pv { } ht_pv_t, *ht_pv_p; int ht_add_table(str *name, int autoexp, str *dbtable, int size, int dbmode, - int itype, int_str *ival); + int itype, int_str *ival, int updateexpire); int ht_init_tables(void); int ht_destroy(void); int ht_set_cell(ht_t *ht, str *name, int type, int_str *val, int mode);

12 years, 7 months

git:master: Core:msg_translator. c fixed compiler warnings about unintialized vars

by Marius Zbihlei

Module: sip-router Branch: master Commit: ff8746504bf6688aaf440513896e4aeda40130d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff87465… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Apr 4 16:37:12 2012 +0300 Core:msg_translator.c fixed compiler warnings about unintialized vars --- msg_translator.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/msg_translator.c b/msg_translator.c index 1979f51..1ef2032 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -579,9 +579,9 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, struct lump* r; str* send_address_str; str* send_port_str; - str* recv_address_str; - str* recv_port_str; - int recv_port_no; + str* recv_address_str = NULL; + str* recv_port_str = NULL; + int recv_port_no = 0; struct socket_info* send_sock; @@ -918,9 +918,9 @@ static inline void process_lumps( struct sip_msg* msg, int s_offset; str* send_address_str; str* send_port_str; - str* recv_address_str; - str* recv_port_str; - int recv_port_no; + str* recv_address_str = NULL; + str* recv_port_str = NULL; + int recv_port_no = 0; struct socket_info* send_sock; #ifdef USE_COMP

12 years, 7 months

compiler warnings

by Juha Heinanen

recently there has been commits that cause compiler warnings shown below. please fix or revert the commits. -- juha action.c: In function ‘run_actions’: action.c:1583: warning: ‘ms’ may be used uninitialized in this function CC (cc) [sip-proxy] msg_translator.o msg_translator.c: In function ‘lumps_len’: msg_translator.c:582: warning: ‘recv_address_str’ may be used uninitialized in this function msg_translator.c:583: warning: ‘recv_port_str’ may be used uninitialized in this function msg_translator.c:584: warning: ‘recv_port_no’ may be used uninitialized in this function msg_translator.c: In function ‘process_lumps’: msg_translator.c:921: warning: ‘recv_address_str’ may be used uninitialized in this function msg_translator.c:922: warning: ‘recv_port_str’ may be used uninitialized in this function msg_translator.c:923: warning: ‘recv_port_no’ may be used uninitialized in this function CC (cc) [L libsrdb1.so.1.0] db_query.o db_query.c: In function ‘db_do_submit_query’: db_query.c:50: warning: ‘ms’ may be used uninitialized in this function CC (cc) [M textops.so] textops.o textops.c: In function ‘subst_hf_f’: textops.c:2242: warning: ‘hfl’ may be used uninitialized in this function textops.c: In function ‘search_hf_f’: textops.c:2161: warning: ‘hfl’ may be used uninitialized in this function

12 years, 7 months

[tracker] Task closed: Debian build of berkeley module fails on debian etch

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#76 - Debian build of berkeley module fails on debian etch User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: The spec files are now specific per debian version. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=76 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

12 years, 7 months

[tracker] Task closed: Strange symbols in NOTIFY dialog-info+xml body

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#25 - Strange symbols in NOTIFY dialog-info+xml body User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: I added a safety check for placeholder of version attribute -- closing this item because it is aged. Open a new one with debug messages if still an issue. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=25 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

12 years, 7 months

git:master: presence*: use xml2-config if available to detect libxml2 paths

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 60971500232b9fdcee1f399ef91a539c9974d9ac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6097150… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 4 12:16:01 2012 +0200 presence*: use xml2-config if available to detect libxml2 paths --- modules_k/presence/Makefile | 17 ++++++++++++++--- modules_k/presence_dialoginfo/Makefile | 19 ++++++++++++++++--- modules_k/presence_xml/Makefile | 17 ++++++++++++++--- 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/modules_k/presence/Makefile b/modules_k/presence/Makefile index a5b5b43..6c01af3 100644 --- a/modules_k/presence/Makefile +++ b/modules_k/presence/Makefile @@ -6,9 +6,20 @@ auto_gen= NAME=presence.so LIBS= -DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ - -I$(LOCALBASE)/include -LIBS+=-L$(LOCALBASE)/lib -lxml2 +XML2CFG=$(shell which xml2-config) + +ifneq ($(XML2CFG),) + + DEFS += $(shell $(XML2CFG) --cflags ) + LIBS += $(shell $(XML2CFG) --libs) + +else + + DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ + -I$(LOCALBASE)/include + LIBS+=-L$(LOCALBASE)/lib -lxml2 + +endif DEFS+=-DOPENSER_MOD_INTERFACE diff --git a/modules_k/presence_dialoginfo/Makefile b/modules_k/presence_dialoginfo/Makefile index cf07373..06927a8 100644 --- a/modules_k/presence_dialoginfo/Makefile +++ b/modules_k/presence_dialoginfo/Makefile @@ -4,9 +4,22 @@ include ../../Makefile.defs auto_gen= NAME=presence_dialoginfo.so -DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ - -I$(LOCALBASE)/include -LIBS+=-L$(LOCALBASE)/lib -lxml2 +LIBS= + +XML2CFG=$(shell which xml2-config) + +ifneq ($(XML2CFG),) + + DEFS += $(shell $(XML2CFG) --cflags ) + LIBS += $(shell $(XML2CFG) --libs) + +else + + DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ + -I$(LOCALBASE)/include + LIBS+=-L$(LOCALBASE)/lib -lxml2 + +endif DEFS+=-DOPENSER_MOD_INTERFACE diff --git a/modules_k/presence_xml/Makefile b/modules_k/presence_xml/Makefile index c675c4c..adbfb45 100644 --- a/modules_k/presence_xml/Makefile +++ b/modules_k/presence_xml/Makefile @@ -6,9 +6,20 @@ auto_gen= NAME=presence_xml.so LIBS= -DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ - -I$(LOCALBASE)/include -LIBS+=-L$(LOCALBASE)/lib -lxml2 +XML2CFG=$(shell which xml2-config) + +ifneq ($(XML2CFG),) + + DEFS += $(shell $(XML2CFG) --cflags ) + LIBS += $(shell $(XML2CFG) --libs) + +else + + DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ + -I$(LOCALBASE)/include + LIBS+=-L$(LOCALBASE)/lib -lxml2 + +endif DEFS+=-DOPENSER_MOD_INTERFACE

12 years, 7 months

git:master: presence_dialoginfo: safety check for version placeholder

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f9589ba8fde7dc30ff98fee225e16c3f5440b213 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f9589ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 4 12:14:40 2012 +0200 presence_dialoginfo: safety check for version placeholder - don't set version attribute if the expected placeholder is not in place - related to FS#25 --- modules_k/presence_dialoginfo/notify_body.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules_k/presence_dialoginfo/notify_body.c b/modules_k/presence_dialoginfo/notify_body.c index efa3b45..6a63d3e 100644 --- a/modules_k/presence_dialoginfo/notify_body.c +++ b/modules_k/presence_dialoginfo/notify_body.c @@ -316,6 +316,11 @@ str *dlginfo_body_setversion(subs_t *subs, str *body) { } version_start += 9; + /* safety check for placeholder - if it is body not set by the module, + * don't update the version */ + if(strncmp(version_start, "00000000000\"", 12)!=0) + return NULL; + version_len = snprintf(version, MAX_INT_LEN + 2,"%d\"", subs->version); if (version_len >= MAX_INT_LEN + 2) { LM_ERR("failed to convert 'version' to string\n");

12 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2012