sr-dev July 2015

sr-dev@lists.kamailio.org

26 participants
301 discussions

[kamailio] dmq_usrloc replication results in garbled AOR's on client nodes (#237)

by 00Asgaroth00

Hi, I have come accross an issue whereby when I replicate registration information to client nodes on the dmq bus, the AOR's of the client nodes for that replication event are garbled. I am running the release version of kamailio v4.3.0 with the following 3 patches applied: https://github.com/kamailio/kamailio/commit/894796f6f1fa2d2778ace5c56f58d20… https://github.com/kamailio/kamailio/commit/039231a3b61c00fe36e868417144daa… https://github.com/kamailio/kamailio/commit/733fd5daf74963b152a2964f9eea1a6… ``` # kamailio -V version: kamailio 4.3.0 (x86_64/linux) c6aa95 flags: STATS: Off, USE_TCP, USE_TLS, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, F_MALLOC, DBG_F_MALLOC, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: c6aa95 compiled on 15:27:56 Jul 7 2015 with gcc 4.4.7 ``` Here is a sipgrep trace of the messaging of the UAC registering and the corresponding KDMQ messages sent to the 2 client nodes on the DMQ bus: ``` U 2015/07/07 15:35:33.103946 10.7.0.109:5060 -> 10.7.0.173:5060 REGISTER sip:subscriber_domain;transport=UDP SIP/2.0. Via: SIP/2.0/UDP 10.7.0.109;branch=z9hG4bK6c8.182de67239d973bafe4e581e6574d8a2.0. Via: SIP/2.0/UDP 192.168.1.238:54270;rport=57937;received=212.2.160.202;branch=z9hG4bK-524287-1---6ab5bde6fb54f05f. Max-Forwards: 69. Contact: <sip:subscriber_name@192.168.1.238:54270;alias=212.2.160.202~57937~1;rinstance=f07ae8c64e7a1962;transport=UDP>. To: <sip:subscriber_name@subscriber_domain;transport=UDP>. From: <sip:subscriber_name@subscriber_domain;transport=UDP>;tag=06548a73. Call-ID: iwGubUeCiNBMYcFqL4Kf4g... CSeq: 1 REGISTER. Expires: 110. Allow: INVITE, ACK, CANCEL, BYE, NOTIFY, REFER, MESSAGE, OPTIONS, INFO, SUBSCRIBE. Supported: replaces, norefersub, extended-refer, timer, outbound, path, X-cisco-serviceuri. User-Agent: Z 3.7.30891 r30851. Allow-Events: presence, kpml. Content-Length: 0. Path: <sip:10.7.0.109;lr;received=sip:212.2.160.202:57937>. . U 2015/07/07 15:35:33.104583 10.7.0.173:5060 -> 10.7.0.109:5060 SIP/2.0 401 Unauthorized. Via: SIP/2.0/UDP 10.7.0.109;branch=z9hG4bK6c8.182de67239d973bafe4e581e6574d8a2.0. Via: SIP/2.0/UDP 192.168.1.238:54270;rport=57937;received=212.2.160.202;branch=z9hG4bK-524287-1---6ab5bde6fb54f05f. To: <sip:subscriber_name@subscriber_domain;transport=UDP>;tag=a55e8da2dec08a1e8faf1efe616c4a58.1527. From: <sip:subscriber_name@subscriber_domain;transport=UDP>;tag=06548a73. Call-ID: iwGubUeCiNBMYcFqL4Kf4g... CSeq: 1 REGISTER. WWW-Authenticate: Digest realm="subscriber_domain", nonce="VZvk4VWb47UOTbXkF6UTXuGtMmOr1krjmNayRoRwfIGueG5nlHEkwEmw7rOA", qop="auth". Server: reg01. Content-Length: 0. . U 2015/07/07 15:35:33.148675 10.7.0.109:5060 -> 10.7.0.173:5060 REGISTER sip:subscriber_domain;transport=UDP SIP/2.0. Via: SIP/2.0/UDP 10.7.0.109;branch=z9hG4bK3c8.fdc7855158bceefc94eb231cfd28c710.0. Via: SIP/2.0/UDP 192.168.1.238:54270;rport=57937;received=212.2.160.202;branch=z9hG4bK-524287-1---7ce5e69b3282c0a4. Max-Forwards: 69. Contact: <sip:subscriber_name@192.168.1.238:54270;alias=212.2.160.202~57937~1;rinstance=f07ae8c64e7a1962;transport=UDP>. To: <sip:subscriber_name@subscriber_domain;transport=UDP>. From: <sip:subscriber_name@subscriber_domain;transport=UDP>;tag=06548a73. Call-ID: iwGubUeCiNBMYcFqL4Kf4g... CSeq: 2 REGISTER. Expires: 110. Allow: INVITE, ACK, CANCEL, BYE, NOTIFY, REFER, MESSAGE, OPTIONS, INFO, SUBSCRIBE. Supported: replaces, norefersub, extended-refer, timer, outbound, path, X-cisco-serviceuri. User-Agent: Z 3.7.30891 r30851. Authorization: Digest username="subscriber_name",realm="subscriber_domain",nonce="VZvk4VWb47UOTbXkF6UTXuGtMmOr1krjmNayRoRwfIGueG5nlHEkwEmw7rOA",uri="sip:subscriber_domain;transport=UDP",response="0f65399a35348e73d88fe8fccdff972f",cnonce="acef54d83f88bc6174ef900d1c202aee",nc=00000001,qop=auth,algorithm=MD5. Allow-Events: presence, kpml. Content-Length: 0. Path: <sip:10.7.0.109;lr;received=sip:212.2.160.202:57937>. . Unknown METHOD: KDMQ U 2015/07/07 15:35:33.151528 10.6.0.173:5060 -> 10.6.0.175:5060 KDMQ sip:usrloc@10.6.0.175:5060 SIP/2.0. Via: SIP/2.0/UDP 10.6.0.173;branch=z9hG4bK9cbc.6c89b871000000000000000000000000.0. To: <sip:usrloc@10.6.0.175:5060>. From: <sip:usrloc@10.6.0.173:5060>;tag=390c95c339281829d3cea6f43c8512cb-0295. CSeq: 10 KDMQ. Call-ID: 7f7531821a1befa0-18771(a)10.6.0.173. Content-Length: 499. User-Agent: kamailio (reg01). Max-Forwards: 1. Content-Type: application/json. . {"action":1,"aor":"subscriber_name@subscriber_domain","ruid":"uloc-559bdf82-4953-b","c":"sip:subscriber_name@192.168.1.238:54270;alias=212.2.160.202~57937~1;rinstance=f07ae8c64e7a1962;transport=UDP","received":"sip:212.2.160.202:57937","path":"<sip:10.7.0.109;lr;received=sip:212.2.160.202:57937>","callid":"iwGubUeCiNBMYcFqL4Kf4g..","user_agent":"Z 3.7.30891 r30851","instance":"","expires":1436279846,"cseq":2,"flags":0,"cflags":64,"q":-1,"last_modified":1436279733,"methods":5087,"reg_id":0} Unknown METHOD: KDMQ U 2015/07/07 15:35:33.151629 10.6.0.173:5060 -> 10.6.0.174:5060 KDMQ sip:usrloc@10.6.0.174:5060 SIP/2.0. Via: SIP/2.0/UDP 10.6.0.173;branch=z9hG4bKacbc.8ccb40f3000000000000000000000000.0. To: <sip:usrloc@10.6.0.174:5060>. From: <sip:usrloc@10.6.0.173:5060>;tag=390c95c339281829d3cea6f43c8512cb-7c1a. CSeq: 10 KDMQ. Call-ID: 7f7531821a1befa1-18771(a)10.6.0.173. Content-Length: 499. User-Agent: kamailio (reg01). Max-Forwards: 1. Content-Type: application/json. . {"action":1,"aor":"subscriber_name@subscriber_domain","ruid":"uloc-559bdf82-4953-b","c":"sip:subscriber_name@192.168.1.238:54270;alias=212.2.160.202~57937~1;rinstance=f07ae8c64e7a1962;transport=UDP","received":"sip:212.2.160.202:57937","path":"<sip:10.7.0.109;lr;received=sip:212.2.160.202:57937>","callid":"iwGubUeCiNBMYcFqL4Kf4g..","user_agent":"Z 3.7.30891 r30851","instance":"","expires":1436279846,"cseq":2,"flags":0,"cflags":64,"q":-1,"last_modified":1436279733,"methods":5087,"reg_id":0} U 2015/07/07 15:35:33.151750 10.7.0.173:5060 -> 10.7.0.109:5060 SIP/2.0 200 OK. Via: SIP/2.0/UDP 10.7.0.109;branch=z9hG4bK3c8.fdc7855158bceefc94eb231cfd28c710.0. Via: SIP/2.0/UDP 192.168.1.238:54270;rport=57937;received=212.2.160.202;branch=z9hG4bK-524287-1---7ce5e69b3282c0a4. To: <sip:subscriber_name@subscriber_domain;transport=UDP>;tag=a55e8da2dec08a1e8faf1efe616c4a58.2d89. From: <sip:subscriber_name@subscriber_domain;transport=UDP>;tag=06548a73. Call-ID: iwGubUeCiNBMYcFqL4Kf4g... CSeq: 2 REGISTER. Contact: <sip:subscriber_name@192.168.1.238:54270;alias=212.2.160.202~57937~1;rinstance=f07ae8c64e7a1962;transport=UDP>;expires=113;received="sip:212.2.160.202:57937". Server: reg01. Content-Length: 0. . ``` Here is the output of "kamctl ul show" on the node that the UAC registered on: ``` [reg01]# kamctl ul show Domain:: location table=1024 records=1 max_slot=1 AOR:: subscriber_name@subscriber_domain Contact:: sip:subscriber_name@192.168.1.238:54270;alias=212.2.160.202~57937~1;rinstance=f07ae8c64e7a1962;transport=UDP Q= Expires:: 22 Callid:: iwGubUeCiNBMYcFqL4Kf4g.. Cseq:: 2 User-agent:: Z 3.7.30891 r30851 Received:: sip:212.2.160.202:57937 Path:: <sip:10.7.0.109;lr;received=sip:212.2.160.202:57937> State:: CS_NEW Flags:: 0 Cflag:: 64 Socket:: udp:10.7.0.173:5060 Methods:: 5087 Ruid:: uloc-559bdf82-4953-b Reg-Id:: 0 Last-Keepalive:: 1436279733 Last-Modified:: 1436279733 ``` And here is the output of "kamctl ul show" on the two client nodes on the bus: ``` [reg02]# kamctl ul show Domain:: location table=1024 records=1 max_slot=1 AOR:: À.e [reg03]# kamctl ul show Domain:: location table=1024 records=1 max_slot=1 AOR:: Àn" ``` My dmq related parameter settings are as follows: ``` # grep -i dmq module_definitions.cfg loadmodule "dmq.so" loadmodule "dmq_usrloc.so" # ----- dmq params ----- modparam("dmq", "server_address", DMQ_ADDRESS) modparam("dmq", "notification_address", "sip:sip-registrars:5060") modparam("dmq", "multi_notify", 1) modparam("dmq", "num_workers", 4) # ----- dmq_usrloc params ----- modparam("dmq_usrloc", "enable", 1) ``` The "sip-registrars" host/domain name resolves to the following 3 addresses (via DNS): ``` 10.6.0.173 10.6.0.174 10.6.0.175 ``` I am getting the following nathelper errors in the logs of the client nodes too, I presume, because of the garbeld AOR: ``` Jul 7 15:35:45 reg02 /usr/sbin/kamailio[5466]: ERROR: <core> [parser/parse_rr.c:71]: do_parse_rr_body(): parse_rr(): Error while parsing name-addr () Jul 7 15:35:45 reg02 /usr/sbin/kamailio[5466]: ERROR: <core> [parser/parse_rr.c:454]: get_path_dst_uri(): failed to parse Path body Jul 7 15:35:45 reg02 /usr/sbin/kamailio[5466]: ERROR: nathelper [nathelper.c:2147]: nh_timer(): failed to get dst_uri for Path Jul 7 15:35:45 reg02 /usr/sbin/kamailio[5466]: ERROR: <core> [parser/parse_rr.c:71]: do_parse_rr_body(): parse_rr(): Error while parsing name-addr () Jul 7 15:35:45 reg02 /usr/sbin/kamailio[5466]: ERROR: <core> [parser/parse_rr.c:454]: get_path_dst_uri(): failed to parse Path body Jul 7 15:35:45 reg02 /usr/sbin/kamailio[5466]: ERROR: nathelper [nathelper.c:2147]: nh_timer(): failed to get dst_uri for Path ``` ``` Jul 7 15:35:58 reg03 /usr/sbin/kamailio[28790]: ERROR: <core> [parser/parse_rr.c:71]: do_parse_rr_body(): parse_rr(): Error while parsing name-addr () Jul 7 15:35:58 reg03 /usr/sbin/kamailio[28790]: ERROR: <core> [parser/parse_rr.c:454]: get_path_dst_uri(): failed to parse Path body Jul 7 15:35:58 reg03 /usr/sbin/kamailio[28790]: ERROR: nathelper [nathelper.c:2147]: nh_timer(): failed to get dst_uri for Path Jul 7 15:35:58 reg03 /usr/sbin/kamailio[28790]: ERROR: <core> [parser/parse_rr.c:71]: do_parse_rr_body(): parse_rr(): Error while parsing name-addr () Jul 7 15:35:58 reg03 /usr/sbin/kamailio[28790]: ERROR: <core> [parser/parse_rr.c:454]: get_path_dst_uri(): failed to parse Path body Jul 7 15:35:58 reg03 /usr/sbin/kamailio[28790]: ERROR: nathelper [nathelper.c:2147]: nh_timer(): failed to get dst_uri for Path Jul 7 15:35:58 reg03 /usr/sbin/kamailio[28790]: ERROR: <core> [parser/parse_rr.c:71]: do_parse_rr_body(): parse_rr(): Error while parsing name-addr () Jul 7 15:35:58 reg03 /usr/sbin/kamailio[28790]: ERROR: <core> [parser/parse_rr.c:454]: get_path_dst_uri(): failed to parse Path body Jul 7 15:35:58 reg03 /usr/sbin/kamailio[28790]: ERROR: nathelper [nathelper.c:2147]: nh_timer(): failed to get dst_uri for Path ``` Please let me know if you require any further info from me. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/237

9 years, 4 months

[kamailio] Crash on start up synchronisation with dmq_usrloc (#244)

by Paul Arnold

Hi, I've tested 4.3.0, and master as of 99f7d67b20c011e78c277a44ea8cd4d6a820806f and I see the same crash on both. I have two nodes synchronising with each other. If there are no usrloc entries then everything works fine. The problem occurs on start up when starting one node will cause the other, already running, node to crash. For example, if there are usrloc entries on node A and node B is not running then when node B is started it will cause node A to crash. Here's the backtrace: ``` #0 0x00007f13d9ac3f50 in core_hash (s1=0x7fff2a04be80, s2=0x0, size=0) at ../../hashes.h:276 276 v=(*p<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; (gdb) bt #0 0x00007f13d9ac3f50 in core_hash (s1=0x7fff2a04be80, s2=0x0, size=0) at ../../hashes.h:276 #1 0x00007f13d9ac9a2d in ul_get_aorhash (_aor=0x7fff2a04be80) at urecord.c:805 #2 0x00007f13d9abf83e in unlock_udomain (_d=0x7f13d38d0e08, _aor=0x7fff2a04be80) at udomain.c:1053 #3 0x00007f13d7ea8cad in usrloc_get_all_ucontact (node=0x7f13d38e6860) at usrloc_sync.c:178 #4 0x00007f13d7eac389 in usrloc_dmq_handle_msg (msg=0x7f13d38e9d08, resp=0x7fff2a04c0e0, node=0x7f13d38e6860) at usrloc_sync.c:360 #5 0x00007f13d80d01b9 in worker_loop (id=0) at worker.c:105 #6 0x00007f13d80cdc6a in child_init (rank=0) at dmq.c:293 #7 0x0000000000535958 in init_mod_child (m=0x7f13dbac8350, rank=0) at sr_module.c:898 #8 0x0000000000535682 in init_mod_child (m=0x7f13dbac8778, rank=0) at sr_module.c:895 #9 0x0000000000535c77 in init_child (rank=0) at sr_module.c:924 #10 0x0000000000527733 in main_loop () at main.c:1650 #11 0x000000000052d4cb in main (argc=14, argv=0x7fff2a04c648) at main.c:2533 ``` This seems to be a different issue from #236 because the changes in 039231a3b61c00fe36e868417144daa9f04936ba that caused that issue are not in 4.3.0 and also because the fix in 733fd5daf74963b152a2964f9eea1a6fff91858a doesn't help this issue. Please let me know if I can provide any more information to help with this. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/244

9 years, 4 months

git:4.3:785ab99f: dmq_usrloc: use new version of serialized structure returned by usrloc (now includes received address)

by Charles Chance

Module: kamailio Branch: 4.3 Commit: 785ab99f18627f1173c9e1714551577c901f04ed URL: https://github.com/kamailio/kamailio/commit/785ab99f18627f1173c9e1714551577… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-07-16T20:29:56+01:00 dmq_usrloc: use new version of serialized structure returned by usrloc (now includes received address) (cherry picked from commit bc01d8d6c6abfc7912a27df3ac23bffd818758e9) --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/785ab99f18627f1173c9e1714551577… Patch: https://github.com/kamailio/kamailio/commit/785ab99f18627f1173c9e1714551577… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index 7d1cf45..3bd0c24 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -96,7 +96,7 @@ void usrloc_get_all_ucontact(dmq_node_t* node) { int rval, len=0; void *buf, *cp; - str c; + str c, recv; str path; str ruid; unsigned int aorhash; @@ -145,6 +145,9 @@ void usrloc_get_all_ucontact(dmq_node_t* node) break; c.s = (char*)cp + sizeof(c.len); cp = (char*)cp + sizeof(c.len) + c.len; + memcpy(&(recv.len), cp, sizeof(recv.len)); + recv.s = (char*)cp + sizeof(recv.len); + cp = (char*)cp + sizeof(recv.len) + recv.len; memcpy( &send_sock, cp, sizeof(send_sock)); cp = (char*)cp + sizeof(send_sock); memcpy( &flags, cp, sizeof(flags));

9 years, 4 months

git:4.3:5304da51: dmq_usrloc: don't destroy json doc before we're done with it.

by Charles Chance

Module: kamailio Branch: 4.3 Commit: 5304da51e32ba79dbe6bdd60d848c4d4f5afd9bd URL: https://github.com/kamailio/kamailio/commit/5304da51e32ba79dbe6bdd60d848c4d… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-07-16T20:25:30+01:00 dmq_usrloc: don't destroy json doc before we're done with it. (cherry picked from commit 99f7d67b20c011e78c277a44ea8cd4d6a820806f) --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/5304da51e32ba79dbe6bdd60d848c4d… Patch: https://github.com/kamailio/kamailio/commit/5304da51e32ba79dbe6bdd60d848c4d… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index e68949c..7d1cf45 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -328,7 +328,6 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* LM_ERR("unrecognized field in json object\n"); } } - srjson_DestroyDoc(&jdoc); memset( &ci, 0, sizeof(ucontact_info_t)); ci.ruid = ruid; ci.c = &c; @@ -367,16 +366,19 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* default: goto invalid; } + srjson_DestroyDoc(&jdoc); resp->reason = dmq_200_rpl; resp->resp_code = 200; return 0; invalid: + srjson_DestroyDoc(&jdoc); resp->reason = dmq_400_rpl; resp->resp_code = 400; return 0; error: + srjson_DestroyDoc(&jdoc); resp->reason = dmq_500_rpl; resp->resp_code = 500; return 0;

9 years, 4 months

HTTPS access to GIT

by "Константин С. Вишнивецк ий"

Hello, I need HTTPS access to your GIT repo, cause of my corporative proxy. May you implement one, please? -- Best regards, Konstantin S. Vishnivetsky Phone.: +7 913 774-7588 ICQ: 328-468-511 SkyPE: kvishnivetsky URL: http://www.vishnivetsky.ru

9 years, 4 months

git:master:e16372dc: Merge pull request #246 from krieger-od/master

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e16372dc978c15fa0c30e25c9ba8cf7de284e60d URL: https://github.com/kamailio/kamailio/commit/e16372dc978c15fa0c30e25c9ba8cf7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-16T16:58:13+02:00 Merge pull request #246 from krieger-od/master dialog: run event_route[dialog:end] in case of dialog termination by â¦ --- Modified: modules/dialog/dlg_handlers.c Modified: modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/e16372dc978c15fa0c30e25c9ba8cf7… Patch: https://github.com/kamailio/kamailio/commit/e16372dc978c15fa0c30e25c9ba8cf7… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index aae6efb..591e410 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -1404,8 +1404,6 @@ void dlg_ontimeout(struct dlg_tl *tl) { if(dlg_bye_all(dlg, NULL)<0) dlg_unref(dlg, 1); - /* run event route for end of dlg */ - dlg_run_event_route(dlg, NULL, dlg->state, DLG_STATE_DELETED); dlg_unref(dlg, 1); if_update_stat(dlg_enable_stats, expired_dlgs, 1); diff --git a/modules/dialog/dlg_req_within.c b/modules/dialog/dlg_req_within.c index f862ab2..c40a08d 100644 --- a/modules/dialog/dlg_req_within.c +++ b/modules/dialog/dlg_req_within.c @@ -545,6 +545,9 @@ int dlg_bye(struct dlg_cell *dlg, str *hdrs, int side) } ret = send_bye(dlg, side, &all_hdrs); pkg_free(all_hdrs.s); + + dlg_run_event_route(dlg, NULL, dlg->state, DLG_STATE_DELETED); + return ret; } @@ -566,6 +569,9 @@ int dlg_bye_all(struct dlg_cell *dlg, str *hdrs) ret |= send_bye(dlg, DLG_CALLEE_LEG, &all_hdrs); pkg_free(all_hdrs.s); + + dlg_run_event_route(dlg, NULL, dlg->state, DLG_STATE_DELETED); + return ret; }

9 years, 4 months

git:master:9ccc3f51: dialog: run event_route[dialog:end] in case of dialog termination by interface commands

by Andrey Utkin

Module: kamailio Branch: master Commit: 9ccc3f510ce2d97dbe1efb690ef1d4e8f18885d5 URL: https://github.com/kamailio/kamailio/commit/9ccc3f510ce2d97dbe1efb690ef1d4e… Author: Andrey Utkin <andrey.krieger.utkin(a)gmail.com> Committer: Andrey Utkin <andrey.krieger.utkin(a)gmail.com> Date: 2015-07-15T20:29:23Z dialog: run event_route[dialog:end] in case of dialog termination by interface commands --- Modified: modules/dialog/dlg_handlers.c Modified: modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/9ccc3f510ce2d97dbe1efb690ef1d4e… Patch: https://github.com/kamailio/kamailio/commit/9ccc3f510ce2d97dbe1efb690ef1d4e… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index aae6efb..591e410 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -1404,8 +1404,6 @@ void dlg_ontimeout(struct dlg_tl *tl) { if(dlg_bye_all(dlg, NULL)<0) dlg_unref(dlg, 1); - /* run event route for end of dlg */ - dlg_run_event_route(dlg, NULL, dlg->state, DLG_STATE_DELETED); dlg_unref(dlg, 1); if_update_stat(dlg_enable_stats, expired_dlgs, 1); diff --git a/modules/dialog/dlg_req_within.c b/modules/dialog/dlg_req_within.c index f862ab2..c40a08d 100644 --- a/modules/dialog/dlg_req_within.c +++ b/modules/dialog/dlg_req_within.c @@ -545,6 +545,9 @@ int dlg_bye(struct dlg_cell *dlg, str *hdrs, int side) } ret = send_bye(dlg, side, &all_hdrs); pkg_free(all_hdrs.s); + + dlg_run_event_route(dlg, NULL, dlg->state, DLG_STATE_DELETED); + return ret; } @@ -566,6 +569,9 @@ int dlg_bye_all(struct dlg_cell *dlg, str *hdrs) ret |= send_bye(dlg, DLG_CALLEE_LEG, &all_hdrs); pkg_free(all_hdrs.s); + + dlg_run_event_route(dlg, NULL, dlg->state, DLG_STATE_DELETED); + return ret; }

9 years, 4 months

git:master:d796409e: etc/kamailio-oob.cfg: remove modules_k from mpath

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d796409e653031fdfecee554500b06a43b981296 URL: https://github.com/kamailio/kamailio/commit/d796409e653031fdfecee554500b06a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-16T14:18:51+02:00 etc/kamailio-oob.cfg: remove modules_k from mpath --- Modified: etc/kamailio-oob.cfg --- Diff: https://github.com/kamailio/kamailio/commit/d796409e653031fdfecee554500b06a… Patch: https://github.com/kamailio/kamailio/commit/d796409e653031fdfecee554500b06a… --- diff --git a/etc/kamailio-oob.cfg b/etc/kamailio-oob.cfg index 2de8a2b..1f07958 100644 --- a/etc/kamailio-oob.cfg +++ b/etc/kamailio-oob.cfg @@ -223,9 +223,9 @@ voicemail.srv_port = "5060" desc "VoiceMail Port" # set paths to location of modules (to sources or installation folders) #!ifdef WITH_SRCPATH -mpath="modules_k:modules" +mpath="modules" #!else -mpath="/usr/local/lib/kamailio/modules_k/:/usr/local/lib/kamailio/modules/" +mpath="/usr/local/lib/kamailio/modules/" #!endif #!ifdef WITH_MYSQL

9 years, 4 months

git:master:6b5959bc: core: pv api - use buffers for empty and null values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6b5959bc4aa760930ac176b8761af2004260705a URL: https://github.com/kamailio/kamailio/commit/6b5959bc4aa760930ac176b8761af20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-16T12:21:34+02:00 core: pv api - use buffers for empty and null values - safer if any transformation wants to temporary update the value for some operations --- Modified: pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/6b5959bc4aa760930ac176b8761af20… Patch: https://github.com/kamailio/kamailio/commit/6b5959bc4aa760930ac176b8761af20… --- diff --git a/pvapi.c b/pvapi.c index d60aebc..3918895 100644 --- a/pvapi.c +++ b/pvapi.c @@ -592,6 +592,9 @@ static int pv_get_marker(struct sip_msg *msg, pv_param_t *param, (int)pv_str_marker.s[0]); } +static char pv_str_empty_buf[2]; +static char pv_str_null_buf[8]; + static str pv_str_empty = { "", 0 }; static str pv_str_null = { "<null>", 6 }; int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) @@ -1890,6 +1893,13 @@ int pv_init_api(void) tr_init_table(); if(pv_init_buffer()<0) return -1; + + pv_str_empty_buf[0] = '\0'; + pv_str_empty_buf[1] = '\0'; + pv_str_empty.s = pv_str_empty_buf; + strcpy(pv_str_null_buf, "<null>"); + pv_str_null.s = pv_str_null_buf; + if(register_pvars_mod("core", _core_pvs)<0) return -1; return 0;

9 years, 4 months

git:master:fe7b9786: modules/tm: unset async suspended transaction flag post-continue

by jaybeepee

Module: kamailio Branch: master Commit: fe7b9786f5e09735eea25e4f8e70ba694f8c0475 URL: https://github.com/kamailio/kamailio/commit/fe7b9786f5e09735eea25e4f8e70ba6… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-07-16T09:36:18+02:00 modules/tm: unset async suspended transaction flag post-continue --- Modified: modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/fe7b9786f5e09735eea25e4f8e70ba6… Patch: https://github.com/kamailio/kamailio/commit/fe7b9786f5e09735eea25e4f8e70ba6… --- diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 86fb3be..64f9af8 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -437,6 +437,10 @@ int t_continue(unsigned int hash_index, unsigned int label, sip_msg_free(t->uac[branch].reply); t->uac[branch].reply = 0; } + + t->flags &= ~T_ASYNC_SUSPENDED; /*This transaction is no longer suspended so unsetting the SUSPEND flag*/ + + return 0; kill_trans:

9 years, 4 months

← Newer
1
...
17
18
19
20
21
22
23
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2015