sr-dev October 2013

sr-dev@lists.kamailio.org

33 participants
254 discussions

git:master: kamctl: regenerated db script for mohqueue tables

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 3022220043bcc9c421ac175b2a3290950014a7fc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3022220… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 29 08:34:29 2013 +0100 kamctl: regenerated db script for mohqueue tables --- utils/kamctl/db_berkeley/kamailio/mohqcalls | 12 +++ utils/kamctl/db_berkeley/kamailio/mohqueues | 12 +++ utils/kamctl/db_sqlite/mohqueue-create.sql | 24 ++++++ utils/kamctl/dbtext/kamailio/mohqcalls | 2 + utils/kamctl/dbtext/kamailio/mohqueues | 2 + utils/kamctl/mysql/mohqueue-create.sql | 24 ++++++ utils/kamctl/oracle/mohqueue-create.sql | 40 +++++++++ utils/kamctl/postgres/mohqueue-create.sql | 24 ++++++ utils/kamctl/xhttp_pi/mohqueue-mod | 97 +++++++++++++++++++++ utils/kamctl/xhttp_pi/mohqueue-table | 23 +++++ utils/kamctl/xhttp_pi/pi_framework.xml | 120 +++++++++++++++++++++++++++ 11 files changed, 380 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=302…

11 years

mediaproxy-ng Got LOOKUP, but no usable callstreams found

by Juha Heinanen

a sip ua that only supports rtp/avp is sending invite to jssip ua and i make this kind of offer on it: Oct 27 17:28:50 rautu /usr/sbin/sip-proxy[8156]: INFO: ===== making rtpproxy_offer(co1SP+r) outgoing invite looks fine and jssip is happy with it. it replies with this kind of 200 ok: SIP/2.0 200 OK Record-Route: <sip:192.98.102.30;transport=tcp;lr;savpf;pm> Via: SIP/2.0/WS 192.98.102.30;branch=z9hG4bK3347.f9aa980aac8a49f0059ae9f7691cafe5.0;i=2 Via: SIP/2.0/TCP 188.67.67.5:51375;received=192.98.102.30;branch=z9hG4bK85a22944e41f9cac;rport=57018 To: <sip:jh@test.tutpro.com>;tag=egmrvkni4j From: <sip:test@test.tutpro.com>;tag=943af1f962302e2d Call-ID: 96dabb8d0412d3f5 CSeq: 9113 INVITE Contact: <sip:jh@test.tutpro.com;gr=urn:uuid:954352ab-46f2-4eef-b771-9c5ff4900843> Content-Type: application/sdp Content-Length: 1056 v=0 o=- 3981174047439634860 2 IN IP4 127.0.0.1 s=- t=0 0 a=msid-semantic: WMS dUI8U3367dUaz5NAE6cZpoEf3xcoEvApx6dm m=audio 47207 RTP/SAVPF 0 8 101 c=IN IP4 188.67.67.5 a=rtcp:37710 IN IP4 188.67.67.5 a=candidate:4130326675 1 udp 2113937151 188.67.67.5 47207 typ host generation 0 a=candidate:1742886165 1 udp 2113937151 192.98.102.30 33266 typ host generation 0 a=candidate:4130326675 2 udp 2113937150 188.67.67.5 37710 typ host generation 0 a=candidate:1742886165 2 udp 2113937150 192.98.102.30 45924 typ host generation 0 a=ice-ufrag:CwQt9Ssgev6ee3Bj a=ice-pwd:JDANa2ehlkWeV4qxjG5Kqb3c a=mid:audio a=sendrecv a=crypto:0 AES_CM_128_HMAC_SHA1_80 inline:LPd/5pIsj4VD6peaLVALE83pz7z3d5DCU1El0cRm a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:101 telephone-event/8000 a=ssrc:449829374 cname:CagN0RFDWP+bPWyu a=ssrc:449829374 msid:dUI8U3367dUaz5NAE6cZpoEf3xcoEvApx6dm dUI8U3367dUaz5NAE6cZpoEf3xcoEvApx6dma0 a=ssrc:449829374 mslabel:dUI8U3367dUaz5NAE6cZpoEf3xcoEvApx6dm a=ssrc:449829374 label:dUI8U3367dUaz5NAE6cZpoEf3xcoEvApx6dma0 i then make this kind of answer on the 200 ok: Oct 27 17:28:55 rautu /usr/sbin/sip-proxy[8160]: INFO: ===== making rtpproxy_answer(co2sp+r) for some reason mediaproxy-ng does not like the answer and reports: Oct 27 17:28:55 rautu mediaproxy-ng[17684]: [96dabb8d0412d3f5 - z9hG4bK85a22944e41f9cac] Got LOOKUP, but no usable callstreams found still mediaproxy-ng works as it should and calling ua gets this kind of 200 ok: T 2013/10/27 17:28:55.915677 192.98.102.30:5060 -> 192.98.102.30:57018 [AP] SIP/2.0 200 OK. Record-Route: <sip:192.98.102.30;transport=tcp;lr;savpf;pm>. Via: SIP/2.0/TCP 188.67.67.5:51375;received=192.98.102.30;branch=z9hG4bK85a22944e41f9cac;rport=57018. To: <sip:jh@test.tutpro.com>;tag=egmrvkni4j. From: <sip:test@test.tutpro.com>;tag=943af1f962302e2d. Call-ID: 96dabb8d0412d3f5. CSeq: 9113 INVITE. Contact: <sip:jh@test.tutpro.com;gr=urn:uuid:954352ab-46f2-4eef-b771-9c5ff4900843>. Content-Type: application/sdp. Content-Length: 789. . v=0. o=- 3981174047439634860 2 IN IP4 192.98.102.30. s=-. t=0 0. a=msid-semantic: WMS dUI8U3367dUaz5NAE6cZpoEf3xcoEvApx6dm. a=ice-lite. m=audio 50226 RTP/AVP 0 8 101. c=IN IP4 192.98.102.30. a=mid:audio. a=sendrecv. a=rtpmap:0 PCMU/8000. a=rtpmap:8 PCMA/8000. a=rtpmap:101 telephone-event/8000. a=ssrc:449829374 cname:CagN0RFDWP+bPWyu. a=ssrc:449829374 msid:dUI8U3367dUaz5NAE6cZpoEf3xcoEvApx6dm dUI8U3367dUaz5NAE6cZpoEf3xcoEvApx6dma0. a=ssrc:449829374 mslabel:dUI8U3367dUaz5NAE6cZpoEf3xcoEvApx6dm. a=ssrc:449829374 label:dUI8U3367dUaz5NAE6cZpoEf3xcoEvApx6dma0. a=rtcp:50227. a=ice-ufrag:3AXaewTZ. a=ice-pwd:kFLmjvPdBqGhKHfgNnbHhLuljrtw. a=candidate:G16dyvMo2umxYq42 1 UDP 2130706432 192.98.102.30 50226 typ host. a=candidate:G16dyvMo2umxYq42 2 UDP 2130706431 192.98.102.30 50227 typ host. why does mediaproxy-ng claim that does not find any usable streams even when it does proper job on the 200 ok and the call works fine? -- juha

11 years

mediaproxy-ng rtpproxy_answer flags

by Juha Heinanen

let say that mediaproxy-ng rtpproxy_offer had flags SP (RTP/SAVPF was sent to callee). is it necessary to have corresponding flags (e.g. sp) in rtpproxy_answer call or does mediaproxy-ng remember, what caller's profile was when corresponding rtpproxy_offer was called? -- juha

11 years

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Jason Penton

Module: sip-router Branch: master Commit: 3eeeed2aeeb924afeabc3fc8337561624f0c41d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3eeeed2… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Mon Oct 28 15:03:08 2013 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

11 years

git:master: modules/tm: fixed pkg memory leak in TM which happens in async reply processing

by Jason Penton

Module: sip-router Branch: master Commit: 946e1f01889c67a835583f4df2c773d227693ea7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=946e1f0… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Mon Oct 28 14:51:12 2013 +0200 modules/tm: fixed pkg memory leak in TM which happens in async reply processing --- modules/tm/h_table.h | 1 + modules/tm/t_suspend.c | 54 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 41 insertions(+), 14 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 1f9f376..5790935 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -215,6 +215,7 @@ typedef struct ua_client { /* if we store a reply (branch picking), this is where it is */ struct sip_msg *reply; + char *end_reply; /* pointer to end of sip_msg so we know the shm blocked used in clone...(used in async replies) */ struct retr_buf request; /* we maintain a separate copy of cancel rather than reuse the structure for original request; the diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index f2cacbc..d898984 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -119,12 +119,14 @@ int t_suspend(struct sip_msg *msg, LOG(L_DBG,"DEBUG: t_suspend_reply:Cloning reply message to t->uac[branch].reply\n"); - t->uac[branch].reply = sip_msg_cloner( msg, 0 ); + int sip_msg_len = 0; + t->uac[branch].reply = sip_msg_cloner( msg, &sip_msg_len ); if (! t->uac[branch].reply ) { LOG(L_ERR, "ERROR: t_suspend_reply: can't alloc' clone memory\n"); return -1; } + t->uac[branch].end_reply = ((char*)t->uac[branch].reply) + sip_msg_len; LOG(L_DBG,"DEBUG: t_suspend_reply: Saving transaction data\n"); t->uac[branch].reply->flags = msg->flags; @@ -156,7 +158,7 @@ int t_continue(unsigned int hash_index, unsigned int label, struct action *route) { struct cell *t; - struct sip_msg faked_req, faked_resp; + struct sip_msg faked_req; struct cancel_info cancel_data; int branch; struct ua_client *uac =NULL; @@ -283,27 +285,19 @@ int t_continue(unsigned int hash_index, unsigned int label, t->uac[branch].reply->msg_flags &= ~FL_RPL_SUSPENDED; if (t->uas.request) t->uas.request->msg_flags&= ~FL_RPL_SUSPENDED; - LOG(L_DBG,"DEBUG: t_continue_reply: Setting up faked environment"); - if (!fake_resp(&faked_resp, t->uac[branch].reply, 0 /* extra flags */, 0)) { - LOG(L_ERR, "ERROR: t_continue_reply: fake_resp failed\n"); - ret = -1; - goto kill_trans; - } - - faked_env( t, &faked_resp, 1); + faked_env( t, t->uac[branch].reply, 1); LOG(L_DBG,"DEBUG: Running pre script\n"); - if (exec_pre_script_cb(&faked_resp, cb_type)>0) { - if (run_top_route(route, &faked_resp, 0)<0){ + if (exec_pre_script_cb(t->uac[branch].reply, cb_type)>0) { + if (run_top_route(route, t->uac[branch].reply, 0)<0){ LOG(L_ERR, "ERROR: t_continue_reply: Error in run_top_route\n"); } LOG(L_DBG,"DEBUG: t_continue_reply: Running exec post script\n"); - exec_post_script_cb(&faked_resp, cb_type); + exec_post_script_cb(t->uac[branch].reply, cb_type); } LOG(L_DBG,"DEBUG: t_continue_reply: Restoring previous environment"); faked_env( t, 0, 1); - free_faked_resp(&faked_resp, t, branch); int reply_status; @@ -387,6 +381,38 @@ done: /* unref the transaction */ t_unref(t->uac[branch].reply); LOG(L_DBG,"DEBUG: t_continue_reply: Freeing earlier cloned reply\n"); + /* free header's parsed structures that were added by failure handlers */ + struct hdr_field* hdr; + struct hdr_field* prev = 0; + struct hdr_field* tmp = 0; + for( hdr=t->uac[branch].reply->headers ; hdr ; hdr=hdr->next ) { + if ( hdr->parsed && hdr_allocs_parse(hdr) && + (hdr->parsed<(void*)t->uac[branch].reply || + hdr->parsed>=(void*)t->uac[branch].end_reply)) { + clean_hdr_field(hdr); + hdr->parsed = 0; + } + } + + /* now go through hdr_fields themselves and remove the pkg allocated space */ + hdr = t->uac[branch].reply->headers; + while (hdr) { + if ( hdr && ((void*)hdr<(void*)t->uac[branch].reply || + (void*)hdr>=(void*)t->uac[branch].end_reply)) { + //this header needs to be freed and removed form the list. + if (!prev) { + t->uac[branch].reply->headers = hdr->next; + } else { + prev->next = hdr->next; + } + tmp = hdr; + hdr = hdr->next; + pkg_free(tmp); + } else { + prev = hdr; + hdr = hdr->next; + } + } sip_msg_free(t->uac[branch].reply); t->uac[branch].reply = 0; }

11 years

git:master: modules/ims_qos: memory optimisation

by Richard Good

Module: sip-router Branch: master Commit: b5638f712711deb8413d7e585369adf8f4a421ee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5638f7… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Mon Oct 28 14:41:22 2013 +0200 modules/ims_qos: memory optimisation Fixed pkg memory allocation for framed IP AVP and flow buffer AVP Instead of repeatedly alloc'ing and free'ing pkg memory we allocate once and re-use Results in better pkg memory overhead --- modules/ims_qos/rx_avp.c | 101 +++++++++++++++++++++++++++------------------- 1 files changed, 59 insertions(+), 42 deletions(-) diff --git a/modules/ims_qos/rx_avp.c b/modules/ims_qos/rx_avp.c index d628192..65c8a43 100644 --- a/modules/ims_qos/rx_avp.c +++ b/modules/ims_qos/rx_avp.c @@ -156,9 +156,12 @@ static inline str rx_get_avp(AAAMessage *msg, int avp_code, int vendor_id, * see http://beej.us/guide/bgnet/output/html/multipage/inet_ntopman.html * http://beej.us/guide/bgnet/output/html/multipage/sockaddr_inman.html */ + +static unsigned int ip_buflen = 0; +static char* ip_buf = 0; + int rx_add_framed_ip_avp(AAA_AVP_LIST * list, str ip, uint16_t version) { ip_address_prefix ip_adr; - char* ip_pkg = 0; int ret = 0; if (ip.len < 0) return 0; @@ -169,28 +172,36 @@ int rx_add_framed_ip_avp(AAA_AVP_LIST * list, str ip, uint16_t version) { if (ip.len > INET6_ADDRSTRLEN) goto error; } - ip_pkg = (char*) pkg_malloc((ip.len + 1) * sizeof (char)); - if (!ip_pkg) { - LM_ERR("PCC_create_framed_ip_avp: could not allocate %i from pkg\n", ip.len + 1); - goto error; + int len = ip.len + 1; + if (!ip_buf || ip_buflen < len) { + if (ip_buf) + pkg_free(ip_buf); + ip_buf = (char*)pkg_malloc(len); + if (!ip_buf) { + LM_ERR("rx_add_framed_ip_avp: out of memory \ + when allocating %i bytes in pkg\n", len); + goto error; + } + ip_buflen = len; } - memcpy(ip_pkg, ip.s, ip.len); - ip_pkg[ip.len] = '\0'; - + memcpy(ip_buf, ip.s, ip.len); + ip_buf[ip.len] = '\0'; + ip_adr.addr.ai_family = version; if (version == AF_INET) { - if (inet_pton(AF_INET, ip_pkg, &(ip_adr.addr.ip.v4.s_addr)) != 1) goto error; + if (inet_pton(AF_INET, ip_buf, &(ip_adr.addr.ip.v4.s_addr)) != 1) goto error; ret = cdp_avp->nasapp.add_Framed_IP_Address(list, ip_adr.addr); } else { - if (inet_pton(AF_INET6, ip_pkg, &(ip_adr.addr.ip.v6.s6_addr)) != 1) goto error; + if (inet_pton(AF_INET6, ip_buf, &(ip_adr.addr.ip.v6.s6_addr)) != 1) goto error; ret = cdp_avp->nasapp.add_Framed_IPv6_Prefix(list, ip_adr); } + //TODO: should free ip_buf in module shutdown.... + error: - if (ip_pkg) pkg_free(ip_pkg); return ret; } @@ -511,14 +522,17 @@ static char * permit_out_with_ports = "permit out %i from %.*s %u to %.*s %u"; static char * permit_in_with_ports = "permit in %i from %.*s %u to %.*s %u"; //static char * permit_in_with_ports = "permit in %i from %.*s %u to %.*s %u %s"; +static unsigned int flowdata_buflen = 0; +static str flowdata_buf = {0,0}; + AAA_AVP *rx_create_media_subcomponent_avp(int number, char* proto, str *ipA, str *portA, str *ipB, str *portB) { str data; int len, len2; - str flow_data = {0, 0}; - str flow_data2 = {0, 0}; +// str flow_data = {0, 0}; +// str flow_data2 = {0, 0}; AAA_AVP *flow_description1 = 0, *flow_description2 = 0, *flow_number = 0; AAA_AVP *flow_usage = 0; @@ -536,21 +550,16 @@ AAA_AVP *rx_create_media_subcomponent_avp(int number, char* proto, len = (permit_out.len + from_s.len + to_s.len + ipB->len + ipA->len + 4 + proto_len + portA->len + portB->len) * sizeof (char); - flow_data.s = (char*) pkg_malloc(len); - if (!flow_data.s) { - LM_ERR("PCC_create_media_component: out of memory \ - when allocating %i bytes in pkg\n", len); - return NULL; - } - - len2 = len - (permit_out.len - permit_in.len) * sizeof (char); - flow_data2.s = (char*) pkg_malloc(len2); - if (!flow_data2.s) { - LM_ERR("PCC_create_media_component: out of memory \ - when allocating %i bytes in pkg\n", len); - pkg_free(flow_data.s); - flow_data.s = 0; - return NULL; + if (!flowdata_buf.s || flowdata_buflen < len) { + if (flowdata_buf.s) + pkg_free(flowdata_buf.s); + flowdata_buf.s = (char*)pkg_malloc(len); + if (!flowdata_buf.s) { + LM_ERR("PCC_create_media_component: out of memory \ + when allocating %i bytes in pkg\n", len); + return NULL ; + } + flowdata_buflen = len; } set_4bytes(x, number); @@ -563,26 +572,39 @@ AAA_AVP *rx_create_media_subcomponent_avp(int number, char* proto, /*IMS Flow descriptions*/ /*first flow is the receive flow*/ - flow_data.len = snprintf(flow_data.s, len, permit_out_with_ports, proto_int, + flowdata_buf.len = snprintf(flowdata_buf.s, len, permit_out_with_ports, proto_int, ipB->len, ipB->s, intportB, ipA->len, ipA->s, intportA); - flow_data.len = strlen(flow_data.s); + flowdata_buf.len = strlen(flowdata_buf.s); flow_description1 = cdpb.AAACreateAVP(AVP_IMS_Flow_Description, AAA_AVP_FLAG_MANDATORY | AAA_AVP_FLAG_VENDOR_SPECIFIC, - IMS_vendor_id_3GPP, flow_data.s, flow_data.len, + IMS_vendor_id_3GPP, flowdata_buf.s, flowdata_buf.len, AVP_DUPLICATE_DATA); cdpb.AAAAddAVPToList(&list, flow_description1); - /*second flow*/ - flow_data2.len = snprintf(flow_data2.s, len2, permit_in_with_ports, proto_int, + /*second flow*/ + len2 = len - (permit_out.len - permit_in.len) * sizeof (char); + if (!flowdata_buf.s || flowdata_buflen <= len2) { + if (flowdata_buf.s) + pkg_free(flowdata_buf.s); + flowdata_buf.s = (char*) pkg_malloc(len2); + if (!flowdata_buf.s) { + LM_ERR("PCC_create_media_component: out of memory \ + when allocating %i bytes in pkg\n", len2); + return NULL ; + } + flowdata_buflen = len2; + } + + flowdata_buf.len = snprintf(flowdata_buf.s, len2, permit_in_with_ports, proto_int, ipA->len, ipA->s, intportA, ipB->len, ipB->s, intportB); - flow_data2.len = strlen(flow_data2.s); + flowdata_buf.len = strlen(flowdata_buf.s); flow_description2 = cdpb.AAACreateAVP(AVP_IMS_Flow_Description, AAA_AVP_FLAG_MANDATORY | AAA_AVP_FLAG_VENDOR_SPECIFIC, - IMS_vendor_id_3GPP, flow_data2.s, flow_data2.len, + IMS_vendor_id_3GPP, flowdata_buf.s, flowdata_buf.len, AVP_DUPLICATE_DATA); cdpb.AAAAddAVPToList(&list, flow_description2); @@ -596,13 +618,9 @@ AAA_AVP *rx_create_media_subcomponent_avp(int number, char* proto, /*group all AVPS into one big.. and then free the small ones*/ data = cdpb.AAAGroupAVPS(list); - - cdpb.AAAFreeAVPList(&list); - pkg_free(flow_data.s); - flow_data.s = 0; - pkg_free(flow_data2.s); - flow_data2.s = 0; + + //TODO: should free the buffer for the flows in module shutdown.... return (cdpb.AAACreateAVP(AVP_IMS_Media_Sub_Component, AAA_AVP_FLAG_MANDATORY | AAA_AVP_FLAG_VENDOR_SPECIFIC, @@ -610,7 +628,6 @@ AAA_AVP *rx_create_media_subcomponent_avp(int number, char* proto, AVP_FREE_DATA)); } - //just for registration to signalling status much cut down MSC AVP //see 3GPP TS 29.214 4.4.5

11 years

[tracker] Comment added: Invalide tel INVITE crashes 4.0.3

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#348 - Invalide tel INVITE crashes 4.0.3 User who did this - Daniel-Constantin Mierla (miconda) ---------- I injected the invite in a rather simple config file, but tm goes fine with it using latest master and 4.0 branches. Can you give a try with latest branch 4.0 to see if works fine? It might be a side effect of one of the bugs fixed since 4.0.3. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=348#comment1130 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.

11 years

[tracker] Comment added: equals $null and 0 return the same

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#358 - equals $null and 0 return the same User who did this - Daniel-Constantin Mierla (miconda) ---------- Should be fixed now on master. Give it a try and see if it works as expected. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=358#comment1129 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.

11 years

git:master: core: handle pv comparison with $null as when defined is used

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 3856e9e81c8410b220b893a0dfe7114bba6bdc0d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3856e9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Oct 27 16:59:32 2013 +0100 core: handle pv comparison with $null as when defined is used - reported by Victor Seva, closes FS#358 --- cfg.y | 20 ++++++++++++++++++-- rvalue.c | 14 ++++++++++++++ rvalue.h | 1 + 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/cfg.y b/cfg.y index 3b7fbdd..2533f72 100644 --- a/cfg.y +++ b/cfg.y @@ -2756,8 +2756,24 @@ rval_expr: rval { $$=$1; | rval_expr BIN_LSHIFT rval_expr {$$=mk_rve2(RVE_BLSHIFT_OP, $1, $3);} | rval_expr BIN_RSHIFT rval_expr {$$=mk_rve2(RVE_BRSHIFT_OP, $1, $3);} | rval_expr rve_cmpop rval_expr %prec GT { $$=mk_rve2( $2, $1, $3);} - | rval_expr rve_equalop rval_expr %prec EQUAL_T - { $$=mk_rve2( $2, $1, $3);} + | rval_expr rve_equalop rval_expr %prec EQUAL_T { + /* comparing with $null => treat as defined or !defined */ + if($3->op==RVE_RVAL_OP && $3->left.rval.type==RV_PVAR + && $3->left.rval.v.pvs.type==PVT_NULL) { + if($2==RVE_DIFF_OP || $2==RVE_IDIFF_OP + || $2==RVE_STRDIFF_OP) { + DBG("comparison with $null switched to notdefined operator\n"); + $$=mk_rve1(RVE_DEFINED_OP, $1); + } else { + DBG("comparison with $null switched to defined operator\n"); + $$=mk_rve1(RVE_NOTDEFINED_OP, $1); + } + /* free rve struct for $null */ + rve_destroy($3); + } else { + $$=mk_rve2($2, $1, $3); + } + } | rval_expr LOG_AND rval_expr { $$=mk_rve2(RVE_LAND_OP, $1, $3);} | rval_expr LOG_OR rval_expr { $$=mk_rve2(RVE_LOR_OP, $1, $3);} | LPAREN rval_expr RPAREN { $$=$2;} diff --git a/rvalue.c b/rvalue.c index cb0db9c..ddc97c2 100644 --- a/rvalue.c +++ b/rvalue.c @@ -527,6 +527,7 @@ enum rval_type rve_guess_type( struct rval_expr* rve) case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_NOTDEFINED_OP: case RVE_INT_OP: return RV_INT; case RVE_PLUS_OP: @@ -572,6 +573,7 @@ int rve_is_constant(struct rval_expr* rve) case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_NOTDEFINED_OP: case RVE_INT_OP: case RVE_STR_OP: return rve_is_constant(rve->left.rve); @@ -636,6 +638,7 @@ static int rve_op_unary(enum rval_expr_op op) case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_NOTDEFINED_OP: case RVE_INT_OP: case RVE_STR_OP: return 1; @@ -839,6 +842,7 @@ int rve_check_type(enum rval_type* type, struct rval_expr* rve, case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_NOTDEFINED_OP: *type=RV_INT; if (rve_check_type(&type1, rve->left.rve, bad_rve, bad_t, exp_t)){ if (type1==RV_INT){ @@ -2112,6 +2116,10 @@ int rval_expr_eval_int( struct run_act_ctx* h, struct sip_msg* msg, case RVE_DEFINED_OP: ret=int_rve_defined(h, msg, res, rve->left.rve); break; + case RVE_NOTDEFINED_OP: + ret=int_rve_defined(h, msg, res, rve->left.rve); + *res = !(*res); + break; case RVE_STREQ_OP: case RVE_STRDIFF_OP: case RVE_MATCH_OP: @@ -2233,6 +2241,7 @@ int rval_expr_eval_rvint( struct run_act_ctx* h, case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_NOTDEFINED_OP: case RVE_INT_OP: /* operator forces integer type */ ret=rval_expr_eval_int(h, msg, res_i, rve); @@ -2360,6 +2369,7 @@ struct rvalue* rval_expr_eval(struct run_act_ctx* h, struct sip_msg* msg, case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_NOTDEFINED_OP: case RVE_INT_OP: /* operator forces integer type */ r=rval_expr_eval_int(h, msg, &i, rve); @@ -2601,6 +2611,7 @@ struct rval_expr* mk_rval_expr1(enum rval_expr_op op, struct rval_expr* rve1, case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_NOTDEFINED_OP: case RVE_INT_OP: case RVE_STR_OP: break; @@ -2692,6 +2703,7 @@ static int rve_op_is_assoc(enum rval_expr_op op) case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_NOTDEFINED_OP: case RVE_INT_OP: case RVE_STR_OP: /* one operand expression => cannot be assoc. */ @@ -2747,6 +2759,7 @@ static int rve_op_is_commutative(enum rval_expr_op op) case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_NOTDEFINED_OP: case RVE_INT_OP: case RVE_STR_OP: /* one operand expression => cannot be commut. */ @@ -3796,6 +3809,7 @@ int fix_rval_expr(void* p) case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_NOTDEFINED_OP: case RVE_INT_OP: case RVE_STR_OP: ret=fix_rval_expr((void*)rve->left.rve); diff --git a/rvalue.h b/rvalue.h index 14675af..c0c2e0e 100644 --- a/rvalue.h +++ b/rvalue.h @@ -87,6 +87,7 @@ enum rval_expr_op{ RVE_MATCH_OP, /**< 2 members, string ~), returns left matches re(right) */ /* avp, pvars a.s.o */ RVE_DEFINED_OP, /**< one member, returns is_defined(val) (bool) */ + RVE_NOTDEFINED_OP, /**< one member, returns is_not_defined(val) (bool) */ RVE_INT_OP, /**< one member, returns (int)val (int) */ RVE_STR_OP /**< one member, returns (str)val (str) */ };

11 years

[tracker] Comment added: equals $null and 0 return the same

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#358 - equals $null and 0 return the same User who did this - Daniel-Constantin Mierla (miconda) ---------- It is not related to #141. I'll try to get a fix for it soon. Meanwhile, one should be able to use the alternatives with: <code> if(defined($avp(x)) ... or if(!defined($avp(x)) ... </code> ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=358#comment1128 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.

11 years

← Newer
1
2
3
4
5
6
7
8
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2013