sr-dev April 2016

sr-dev@lists.kamailio.org

23 participants
430 discussions

[kamailio/kamailio] kex: adding total_frags to kamcmd pkg.stats (#575)
by Lucian Balaceanu 21 Apr '16

21 Apr '16

Created a patch for 4.1 which allows to display also the total number of pkg fragments upon calling kamcmd pkg.stats. This combines part of the master logic with existing 4.1 logic (for example this version does not combine the SREV_PKG_SET_USED, SREV_PKG_SET_REAL_USED, SREV_PKG_SET_FRAGS into one callback.) Does this look ok? Feel free to close this if not needed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/575 -- Commit Summary -- * kex: adding total_frags to kamcmd pkg.stats -- File Changes -- M events.c (13) M events.h (2) M mem/f_malloc.c (9) M mem/f_malloc.h (1) M mem/q_malloc.c (20) M mem/q_malloc.h (1) M modules/kex/pkg_stats.c (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/575.patch https://github.com/kamailio/kamailio/pull/575.diff --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/575

2 3

git:master:49c198a4: registrar clarification on "domain" in ulc - it's the name of the table used for storing, not the domain in the uri
by Olle E. Johansson 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: 49c198a44a2148d086f24510556cb362e335ae68 URL: https://github.com/kamailio/kamailio/commit/49c198a44a2148d086f24510556cb36… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-04-21T10:58:44+02:00 registrar clarification on "domain" in ulc - it's the name of the table used for storing, not the domain in the uri --- Modified: modules/registrar/README Modified: modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/49c198a44a2148d086f24510556cb36… Patch: https://github.com/kamailio/kamailio/commit/49c198a44a2148d086f24510556cb36… --- diff --git a/modules/registrar/README b/modules/registrar/README index 3dca05e..b9e4c94 100644 --- a/modules/registrar/README +++ b/modules/registrar/README @@ -1075,7 +1075,7 @@ event_route[usrloc:contact-expired] { The "attr" can be: * aor - address of record - * domain - use location domain name + * domain - used location domain/table name * aorhash - hash id for the record * addr - contact address * path - path vector diff --git a/modules/registrar/doc/registrar_admin.xml b/modules/registrar/doc/registrar_admin.xml index 11f6d21..2cd0aa2 100644 --- a/modules/registrar/doc/registrar_admin.xml +++ b/modules/registrar/doc/registrar_admin.xml @@ -1443,7 +1443,7 @@ event_route[usrloc:contact-expired] { </para> </listitem> <listitem> - <para><emphasis>domain</emphasis> - use location domain name + <para><emphasis>domain</emphasis> - used location domain/table name </para> </listitem> <listitem>

1 0

git:master:0f54afd1: core: kemi - exported more of the functions from core
by Daniel-Constantin Mierla 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: 0f54afd10c703cdba9080972d7501873b930ab44 URL: https://github.com/kamailio/kamailio/commit/0f54afd10c703cdba9080972d750187… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-21T00:03:45+02:00 core: kemi - exported more of the functions from core --- Modified: kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/0f54afd10c703cdba9080972d750187… Patch: https://github.com/kamailio/kamailio/commit/0f54afd10c703cdba9080972d750187…

1 0

Crash in 4.3.3:e275bc
by Alex Balashov 21 Apr '16

21 Apr '16

Seem to get some variant of this a lot in one particular installation ... any insight would be appreciated: --- (gdb) thread apply all bt full Thread 1 (Thread 0x7f4ad466d700 (LWP 20657)): #0 0x00007f4ad3cdb625 in raise () from /lib64/libc.so.6 No symbol table info available. #1 0x00007f4ad3cdce05 in abort () from /lib64/libc.so.6 No symbol table info available. #2 0x000000000061e783 in qm_free (qm=0x7f48c9986000, p=0x7f48cdb99780, file=0x7f4ad22a5fbd "tm: h_table.c", func=0x7f4ad22a6298 "free_cell", line=133) at mem/q_malloc.c:455 f = 0x7f48cdb99750 size = 1919388400 next = 0x400 prev = 0x7fff72678a80 __FUNCTION__ = "qm_free" #3 0x00007f4ad21e550d in free_cell (dead_cell=0x7f48cd88bf08) at h_table.c:133 b = 0x7f4ad37d54f8 "\376\373", <incomplete sequence \354> i = 32586 rpl = 0x7fff72678be0 tt = 0x7f4ad223569c foo = 0x415e80 cbs = 0x7f48cd88bf08 cbs_tmp = 0x0 __FUNCTION__ = "free_cell" #4 0x00007f4ad2239e75 in t_unref (p_msg=0x7f4ad37d54f8) at t_lookup.c:1486 kr = 3448291528 __FUNCTION__ = "t_unref" #5 0x00007f4ad228012d in reply_received (p_msg=0x7f4ad37d54f8) at t_reply.c:2507 msg_status = 100 last_uac_status = 0 ack = 0x800000001 <Address 0x800000001 out of bounds> ack_len = 32586 branch = 2 reply_status = 5 onreply_route = 2 cancel_data = {cancel_bitmap = 0, reason = {cause = 0, u = {text = {s = 0x0, len = 7742524}, e2e_cancel = 0x0, packed_hdrs = {s = 0x0, len = 7742524}}}} uac = 0x7f48cd88c470 t = 0x7f48cd88bf08 lack_dst = {send_sock = 0x338168, to = {s = {sa_family = 21646, sa_data = "\247\000\000\000\000\000G\001\000\000\000\000\000"}, sin = {sin_family = 21646, sin_port = 167, sin_addr = {s_addr = 0}, sin_zero = "G\001\000\000\000\000\000"}, sin6 = {sin6_family = 21646, sin6_port = 167, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "G\001\000\000\000\000\000\000\070\006z\323J\177\000", __u6_addr16 = {327, 0, 0, 0, 1592, 54138, 32586, 0}, __u6_addr32 = {327, 0, 3547989560, 32586}}}, sin6_scope_id = 1919389184}}, id = 32767, proto = -35 '\335', send_flags = {f = 72 'H', blst_imask = 98 'b'}} backup_user_from = 0xa85430 backup_user_to = 0xa85438 backup_domain_from = 0xa85440 backup_domain_to = 0xa85448 backup_uri_from = 0xa85420 backup_uri_to = 0xa85428 backup_xavps = 0xa85560 replies_locked = 0 branch_ret = 32767 prev_branch = -746760936 blst_503_timeout = 32586 hf = 0x31a72678ef0 onsend_params = {req = 0x7f4ad34a8390, rpl = 0x7f4a00000000, param = 0x7fff72678e60, code = -746756944, flags = 32586, branch = 0, t_rbuf = 0xa7571a, dst = 0xa75414, send_buf = {s = 0x23fbe0 <Address 0x23fbe0 out of bounds>, len = 3356600}} ctx = {rec_lev = 0, run_flags = 0, last_retcode = -1, jmp_env = {{__jmpbuf = {139959352514288, 3724642127021520483, 4284032, 140735112779456, 0, 0, 3724642127029909091, -3724914439480756637}, __mask_was_saved = 0, __saved_mask = {__val = {0, 140735112777312, 6474523, 8388608, 5032056, 2358192, 3356552, 3375464, 8, 328, 7722415, 7742524, 139959352517760, 140735112777088, 4714492, 0}}}}} __FUNCTION__ = "reply_received" #6 0x000000000048dd80 in do_forward_reply (msg=0x7f4ad37d54f8, mode=0) at forward.c:747 new_buf = 0x0 dst = {send_sock = 0x0, to = {s = {sa_family = 0, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, id = 0, proto = 0 '\000', send_flags = {f = 0 '\000', blst_imask = 0 '\000'}} new_len = 1 r = 0 ip = {af = 1919389696, len = 32767, u = {addrl = {6501186, 56}, addr32 = {6501186, 0, 56, 0}, addr16 = {13122, 99, 0, 0, 56, 0, 0, 0}, addr = "B3c\000\000\000\000\000\070\000\000\000\000\000\000"}} s = 0x7f4ad37d0032 "q" len = 0 __FUNCTION__ = "do_forward_reply" #7 0x000000000048f3c3 in forward_reply (msg=0x7f4ad37d54f8) at forward.c:849 No locals. #8 0x000000000050b394 in receive_msg (buf=0xa75400 "SIP/2.0 100 Trying\r\nVia: SIP/2.0/UDP 56.7.1.169;branch=z9hG4bKb914.a5e1ddc17f374d96d421a56ef28f3057.2;received=56.7.1.169;rport=5060\r\nVia: SIP/2.0/UDP 110.9.13.10:5060;received=110.9.13.10;branch=z9hG4bK4daefb9d;rport=5060\r\nRecord-Route: <sip:56.7.1.169;lr;ftag=as4c723146;fromcor=ejFwbUZxUmpUUFNBejFwbUZxUmpUUFNBejFwbUZx;dlgcor=bc2.e7a3>\r\nFrom: \"13212476993\" <sip:13212476993@56.7.1.169>;tag=as4c723146\r\nTo: <sip:16108615000@56.7.1.169:5060>\r\nCall-ID: 4db5de4a3df03a347b521e25663d9976(a)56.7.1.169\r\nCSeq: 102 INVITE\r\nServer: Cisco 3845\r\nAllow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE\r\nSupported: replaces, timer\r\nSession-Expires: 600;refresher=uas\r\nContact: <sip:16108615000@163.49.52.102:5060>\r\nContent-Length: 0\r\n\r\n", len=794, rcv_info=0x7fff72679200) at receive.c:255 msg = 0x7f4ad37d54f8 ctx = {rec_lev = 10280528, run_flags = 0, last_retcode = 0, jmp_env = {{__jmpbuf = {0, 0, 0, 139959365701792, 1, 0, 171057038096, 10965952}, __mask_was_saved = 1919390216, __saved_mask = {__val = {139959349515664, 12884901901, 139959349515664, 4284032, 140735112779456, 140735112778096, 6310822, 6214357328, 139950596799128, 140735112778064, 6306505, 140735112778352, 170886150808, 10965952, 6306633, 140735112778432}}}}} ret = 1919390112 inb = {s = 0xa75400 "SIP/2.0 100 Trying\r\nVia: SIP/2.0/UDP 56.7.1.169;branch=z9hG4bKb914.a5e1ddc17f374d96d421a56ef28f3057.2;received=56.7.1.169;rport=5060\r\nVia: SIP/2.0/UDP 110.9.13.10:5060;received=110.9.13.10;branch=z9hG4bK4daefb9d;rport=5060\r\nRecord-Route: <sip:56.7.1.169;lr;ftag=as4c723146;fromcor=ejFwbUZxUmpUUFNBejFwbUZxUmpUUFNBejFwbUZx;dlgcor=bc2.e7a3>\r\nFrom: \"13212476993\" <sip:13212476993@56.7.1.169>;tag=as4c723146\r\nTo: <sip:16108615000@56.7.1.169:5060>\r\nCall-ID: 4db5de4a3df03a347b521e25663d9976(a)56.7.1.169\r\nCSeq: 102 INVITE\r\nServer: Cisco 3845\r\nAllow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE\r\nSupported: replaces, timer\r\nSession-Expires: 600;refresher=uas\r\nContact: <sip:16108615000@163.49.52.102:5060>\r\nContent-Length: 0\r\n\r\n", len = 794} __FUNCTION__ = "receive_msg" #9 0x000000000060aad6 in udp_rcv_loop () at udp_server.c:495 len = 794 buf = "SIP/2.0 100 Trying\r\nVia: SIP/2.0/UDP 56.7.1.169;branch=z9hG4bKb914.a5e1ddc17f374d96d421a56ef28f3057.2;received=56.7.1.169;rport=5060\r\nVia: SIP/2.0/UDP 110.9.13.10:5060;received=110.9.13.10;branch=z9hG4bK4daefb9d;rport=5060\r\nRecord-Route: <sip:56.7.1.169;lr;ftag=as4c723146;fromcor=ejFwbUZxUmpUUFNBejFwbUZxUmpUUFNBejFwbUZx;dlgcor=bc2.e7a3>\r\nFrom: \"13212476993\" <sip:13212476993@56.7.1.169>;tag=as4c723146\r\nTo: <sip:16108615000@56.7.1.169:5060>\r\nCall-ID: 4db5de4a3df03a347b521e25663d9976(a)56.7.1.169\r\nCSeq: 102 INVITE\r\nServer: Cisco 3845\r\nAllow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE\r\nSupported: replaces, timer\r\nSession-Expires: 600;refresher=uas\r\nContact: <sip:16108615000@163.49.52.102:5060>\r\nContent-Length: 0\r\n\r\n\000Content-Length: 175\r\nRemote-Party-ID: \"17185076432\" <sip:17185076432@56.7.1.169>;party=calling;privacy=off;screen=no\r\n\r\nv=0\r\no=- 302911045 302911045 IN IP4 208.67.1.4\r\ns=ENSResip\r\nc=IN IP4 47.91.59.64\r\nt=0 0\r\nm=audio 50906 RTP/AVP 18\r\na=rtpmap:18 G729/8000\r\na=fmtp:18 annexb=no\r\na=ptime:20\r\n\000nceSupp:off - - - -\r\n\000=no\r\na=rtpmap:121 frf-dialed-digit/8000\r\na=fmtp:121 0-15\r\na=ptime:20\r\n\000\000\061 0-15\r\na=ptime:20\r\na=direction:both\r\n\000ion:both\r\n\000rection:both\r\n\000\n\000\060\060\060\r\na=rtpmap:101 telephone-event/8000\r\na=fmtp:101 0-16\r\na=ptime:20\r\na=sendrecv\r\n\000\n\000 telephone-event/8000\r\na=fmtp:101 0-16\r\na=silenceSupp:off - - - -\r\na=ptime:20\r\na=sendrecv\r\n\000\012.41.120.9\r\nt=0 0\r\nm=audio 35130 RTP/AVP 18 0 8 101\r\na=rtpmap:101 telephone-event/8000\r\na=fmtp:101 0-15\r\na=ptime:20\r\na=fmtp:18 annexb=no\r\n\000\061 0-15\r\na=ptime:20\r\na=fmtp:18 annexb=no\r\n\000lities\r\nc=IN IP4 97.43.87.90\r\nt=0 0\r\nm=audio 30350 RTP/AVP 18 0 8 101\r\na=rtpmap:18 G729/8000\r\na=fmtp:18 annexb=no\r\na=rtpmap:0 PCMU/8000\r\na=rtpmap:8 PCMA/8000\r\na=rtpmap:101 telephone-event/8000\r\na=fmtp:101 0-15\r\na=sendrecv\r\na=maxptime:20\r\n\000\r\na=maxptime:20\r\n\000\061\060\061 0-15\r\na=sendrecv\r\na=maxptime:20\r\n\000v\r\na=maxptime:20\r\n", '\000' <repeats 63603 times> tmp = 0xa753c0 "208.82.213.10" from = 0x7f4ad377e318 fromlen = 16 ri = {src_ip = {af = 2, len = 4, u = {addrl = {1703608226, 0}, addr32 = {1703608226, 0, 0, 0}, addr16 = {65442, 25994, 0, 0, 0, 0, 0, 0}, addr = "\242\377\212e", '\000' <repeats 11 times>}}, dst_ip = {af = 2, len = 4, u = {addrl = {2845613666, 0}, addr32 = {2845613666, 0, 0, 0}, addr16 = {40546, 43420, 0, 0, 0, 0, 0, 0}, addr = "b\236\234\251", '\000' <repeats 11 times>}}, src_port = 5060, dst_port = 5060, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 2, sa_data = "\023Ģ\377\212e\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 50195, sin_addr = {s_addr = 1703608226}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 1703608226, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x7f4ad34f9428, proto = 1 '\001'} __FUNCTION__ = "udp_rcv_loop" #10 0x00000000004a8023 in main_loop () at main.c:1573 i = 4 pid = 0 si = 0x7f4ad34f9428 si_desc = "udp receiver child=4 sock=56.7.1.169:5060\000\000\000p\223gr\377\177\000\000\v\220N\000\000\000\000\000\300\223gr\377\177\000\000\004\000\000\000\000\000\000\000\200^A\000\000\000\000\000(\265\233\311H\177", '\000' <repeats 14 times>, "\001\000\000\000\300\223gr\377\177\000\000\256\220N\000\000\000\000" nrprocs = 8 __FUNCTION__ = "main_loop" #11 0x00000000004ae4e1 in main (argc=11, argv=0x7fff726796c8) at main.c:2547 cfg_stream = 0x27dc010 c = -1 r = 0 tmp = 0x7fff7267a46d "" tmp_len = 32767 port = 1919391134 proto = 0 options = 0x708e58 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:" ret = -1 seed = 3996106866 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x40d8f2 p = 0xc2 <Address 0xc2 out of bounds> st = {st_dev = 2050, st_ino = 14811292, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 4096, st_blksize = 4096, st_blocks = 8, st_atim = {tv_sec = 1444079676, tv_nsec = 340955661}, st_mtim = {tv_sec = 1444079676, tv_nsec = 340955661}, st_ctim = {tv_sec = 1444079676, tv_nsec = 346955760}, __unused = {0, 0, 0}} __FUNCTION__ = "main" -- Alex Balashov | Principal | Evariste Systems LLC 1447 Peachtree Street NE, Suite 700 Atlanta, GA 30309 United States Tel: +1-800-250-5920 (toll-free) / +1-678-954-0671 (direct) Web: http://www.evaristesys.com/, http://www.csrpswitch.com/

2 1

git:master:9ad70dfd: app_python: handle the exported functions that return bool
by Daniel-Constantin Mierla 20 Apr '16

20 Apr '16

Module: kamailio Branch: master Commit: 9ad70dfd7061136bc86c9276f6064316b42d8012 URL: https://github.com/kamailio/kamailio/commit/9ad70dfd7061136bc86c9276f606431… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-20T17:04:36+02:00 app_python: handle the exported functions that return bool --- Modified: modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/9ad70dfd7061136bc86c9276f606431… Patch: https://github.com/kamailio/kamailio/commit/9ad70dfd7061136bc86c9276f606431… --- diff --git a/modules/app_python/apy_kemi.c b/modules/app_python/apy_kemi.c index d3732b2..27ad6c2 100644 --- a/modules/app_python/apy_kemi.c +++ b/modules/app_python/apy_kemi.c @@ -122,6 +122,13 @@ PyObject *sr_apy_kemi_return_none(void) */ PyObject *sr_apy_kemi_return_int(sr_kemi_t *ket, int rval) { + if(ket!=NULL && ket->rtype==SR_KEMIP_BOOL) { + if(rval==SR_KEMI_TRUE) { + return sr_apy_kemi_return_true(); + } else { + return sr_apy_kemi_return_false(); + } + } return PyInt_FromLong((long)rval); }

1 0

git:master:3a69a010: app_lua: use define SR_KEMI_FALSE instead of 0 for bool return decision
by Daniel-Constantin Mierla 20 Apr '16

20 Apr '16

Module: kamailio Branch: master Commit: 3a69a01054262b7a02f4c03d15ea296eb84f7c79 URL: https://github.com/kamailio/kamailio/commit/3a69a01054262b7a02f4c03d15ea296… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-20T17:03:59+02:00 app_lua: use define SR_KEMI_FALSE instead of 0 for bool return decision --- Modified: modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/3a69a01054262b7a02f4c03d15ea296… Patch: https://github.com/kamailio/kamailio/commit/3a69a01054262b7a02f4c03d15ea296… --- diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index fd9acce..256c3b0 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -1430,7 +1430,7 @@ int sr_kemi_return(lua_State* L, sr_kemi_t *ket, int rc) lua_pushinteger(L, rc); return 1; } - if(ket->rtype==SR_KEMIP_BOOL && rc!=0) { + if(ket->rtype==SR_KEMIP_BOOL && rc!=SR_KEMI_FALSE) { return app_lua_return_true(L); } return app_lua_return_false(L);

1 0

git:master:fb1e1d84: core: kemi - exported is_myself()
by Daniel-Constantin Mierla 20 Apr '16

20 Apr '16

Module: kamailio Branch: master Commit: fb1e1d847e6e6aeedb17949e7f871c966cca2c76 URL: https://github.com/kamailio/kamailio/commit/fb1e1d847e6e6aeedb17949e7f871c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-20T16:58:09+02:00 core: kemi - exported is_myself() --- Modified: kemi.c Modified: kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/fb1e1d847e6e6aeedb17949e7f871c9… Patch: https://github.com/kamailio/kamailio/commit/fb1e1d847e6e6aeedb17949e7f871c9… --- diff --git a/kemi.c b/kemi.c index 0bc6e3c..9c36d51 100644 --- a/kemi.c +++ b/kemi.c @@ -24,10 +24,12 @@ #include <stdlib.h> #include "dprint.h" +#include "forward.h" #include "locking.h" #include "data_lump.h" #include "data_lump_rpl.h" #include "mem/shm.h" +#include "parser/parse_uri.h" #include "kemi.h" @@ -98,6 +100,34 @@ static int sr_kemi_core_drop(sip_msg_t *msg) /** * */ +static int sr_kemi_core_is_myself(sip_msg_t *msg, str *uri) +{ + struct sip_uri puri; + int ret; + + if(uri==NULL || uri->s==NULL) { + return SR_KEMI_FALSE; + } + if(uri->len>4 && (strncmp(uri->s, "sip:", 4)==0 + || strncmp(uri->s, "sips:", 5)==0)) { + if(parse_uri(uri->s, uri->len, &puri)!=0) { + LM_ERR("failed to parse uri [%.*s]\n", uri->len, uri->s); + return SR_KEMI_FALSE; + } + ret = check_self(&puri.host, (puri.port.s)?puri.port_no:0, + (puri.transport_val.s)?puri.proto:0); + } else { + ret = check_self(uri, 0, 0); + } + if(ret==1) { + return SR_KEMI_TRUE; + } + return SR_KEMI_FALSE; +} + +/** + * + */ static sr_kemi_t _sr_kemi_core[] = { { str_init(""), str_init("dbg"), SR_KEMIP_NONE, sr_kemi_core_dbg, @@ -119,6 +149,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_myself"), + SR_KEMIP_BOOL, sr_kemi_core_is_myself, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; diff --git a/kemi.h b/kemi.h index 3c9e0e1..bd3c19d 100644 --- a/kemi.h +++ b/kemi.h @@ -31,6 +31,9 @@ #define SR_KEMIP_STR (1<<1) /* type str* */ #define SR_KEMIP_BOOL (1<<2) /* type boolean (0/1) */ +#define SR_KEMI_FALSE 0 +#define SR_KEMI_TRUE 1 + #define SR_KEMI_PARAMS_MAX 6 typedef struct sr_kemi {

1 0

git:4.3:1b0c0aff: erlang: fix parsing function params
by Seudin Kasumovic 20 Apr '16

20 Apr '16

Module: kamailio Branch: 4.3 Commit: 1b0c0aff32290eb97e6e1f750432db90a35992e5 URL: https://github.com/kamailio/kamailio/commit/1b0c0aff32290eb97e6e1f750432db9… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2016-04-20T12:11:02+02:00 erlang: fix parsing function params - remove double parsing function params - free memory used in parsing params (cherry picked from commit 28b320088fcad8b8875f0528873a49cba9c74619) --- Modified: modules/erlang/mod_erlang.c Modified: modules/erlang/mod_erlang.h --- Diff: https://github.com/kamailio/kamailio/commit/1b0c0aff32290eb97e6e1f750432db9… Patch: https://github.com/kamailio/kamailio/commit/1b0c0aff32290eb97e6e1f750432db9…

1 0

git:4.3:d7795de8: erlang: fix memory leak in debug macro
by Seudin Kasumovic 20 Apr '16

20 Apr '16

Module: kamailio Branch: 4.3 Commit: d7795de8f984ef88bc4c06beb3d8c210ecc8aea0 URL: https://github.com/kamailio/kamailio/commit/d7795de8f984ef88bc4c06beb3d8c21… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2016-04-20T12:10:37+02:00 erlang: fix memory leak in debug macro - free temporary used encoding buffer (cherry picked from commit 2b11990929ae1d097bfb66848136bd247130263b) --- Modified: modules/erlang/erl_helpers.h --- Diff: https://github.com/kamailio/kamailio/commit/d7795de8f984ef88bc4c06beb3d8c21… Patch: https://github.com/kamailio/kamailio/commit/d7795de8f984ef88bc4c06beb3d8c21… --- diff --git a/modules/erlang/erl_helpers.h b/modules/erlang/erl_helpers.h index 2aed063..fa8fdc5 100644 --- a/modules/erlang/erl_helpers.h +++ b/modules/erlang/erl_helpers.h @@ -141,6 +141,7 @@ do { \ ei_s_print_term(&pbuf, pidbuf.buff, &i); \ ei_x_print_reg_msg(buf, pbuf, send); \ free(pbuf); \ + ei_x_free(&pidbuf); \ } while(0) int ei_decode_strorbin(char *buf, int *index, int maxlen, char *dst);

1 0

git:4.3:c5b938f5: erlang: fix uninitialized member variable
by Seudin Kasumovic 20 Apr '16

20 Apr '16

Module: kamailio Branch: 4.3 Commit: c5b938f51a5fe817fb4b4c8d7c01bb3d9d8c16ef URL: https://github.com/kamailio/kamailio/commit/c5b938f51a5fe817fb4b4c8d7c01bb3… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2016-04-20T12:10:15+02:00 erlang: fix uninitialized member variable - avoid conditional jump on uninitialized value (cherry picked from commit 0e3b19f4b99ea0b9e4eff2decb641e5da2488573) --- Modified: modules/erlang/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/c5b938f51a5fe817fb4b4c8d7c01bb3… Patch: https://github.com/kamailio/kamailio/commit/c5b938f51a5fe817fb4b4c8d7c01bb3… --- diff --git a/modules/erlang/worker.c b/modules/erlang/worker.c index 0bf1be8..86ad3f9 100644 --- a/modules/erlang/worker.c +++ b/modules/erlang/worker.c @@ -44,6 +44,7 @@ int worker_init(worker_handler_t *phandler, int fd, const ei_cnode *ec) phandler->sockfd = fd; phandler->ec = *ec; phandler->next = NULL; + phandler->new = NULL; return 0; }

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2016