sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

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

by Juha Heinanen

Module: sip-router Branch: master Commit: 2be84576fb5bc7d973b84b7a9f6a61b28ce2cead URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2be8457… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 10 09:11:55 2013 +0300 Merge branch 'master' of ssh://git.sip-router.org/sip-router modules/tm: allow calling of t_branch_timeout and t_branch_replied from tm:branch-failure event route ---

11 years, 8 months

git:master: pv: implement pv transformation {en, de}code.base64

by Richard Fuchs

Module: sip-router Branch: master Commit: 12f441f4b75f15ab25fc42889bfce65940d0c0d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=12f441f… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Tue Apr 9 16:38:22 2013 -0400 pv: implement pv transformation {en,de}code.base64 --- modules/pv/pv_trans.c | 33 +++++++++++++++++++++++++++++++++ modules/pv/pv_trans.h | 1 + 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/modules/pv/pv_trans.c b/modules/pv/pv_trans.c index fc9597b..1e553f1 100644 --- a/modules/pv/pv_trans.c +++ b/modules/pv/pv_trans.c @@ -39,6 +39,7 @@ #include "../../trim.h" #include "../../pvapi.h" #include "../../dset.h" +#include "../../basex.h" #include "../../parser/parse_param.h" #include "../../parser/parse_uri.h" @@ -195,6 +196,32 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.s = _tr_buffer; val->rs.len = i; break; + case TR_S_ENCODEBASE64: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + i = base64_enc((unsigned char *) val->rs.s, val->rs.len, + (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); + if (i < 0) + return -1; + _tr_buffer[i] = '\0'; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + val->rs.len = i; + break; + case TR_S_DECODEBASE64: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + i = base64_dec((unsigned char *) val->rs.s, val->rs.len, + (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); + if (i < 0 || (i == 0 && val->rs.len > 0)) + return -1; + _tr_buffer[i] = '\0'; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + val->rs.len = i; + break; case TR_S_ESCAPECOMMON: if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); @@ -1749,6 +1776,12 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==11 && strncasecmp(name.s, "decode.hexa", 11)==0) { t->subtype = TR_S_DECODEHEXA; goto done; + } else if(name.len==13 && strncasecmp(name.s, "encode.base64", 13)==0) { + t->subtype = TR_S_ENCODEBASE64; + goto done; + } else if(name.len==13 && strncasecmp(name.s, "decode.base64", 13)==0) { + t->subtype = TR_S_DECODEBASE64; + goto done; } else if(name.len==13 && strncasecmp(name.s, "escape.common", 13)==0) { t->subtype = TR_S_ESCAPECOMMON; goto done; diff --git a/modules/pv/pv_trans.h b/modules/pv/pv_trans.h index a34eca2..e2aa494 100644 --- a/modules/pv/pv_trans.h +++ b/modules/pv/pv_trans.h @@ -37,6 +37,7 @@ enum _tr_type { TR_NONE=0, TR_STRING, TR_URI, TR_PARAMLIST, TR_NAMEADDR, enum _tr_s_subtype { TR_S_NONE=0, TR_S_LEN, TR_S_INT, TR_S_MD5, TR_S_SUBSTR, TR_S_SELECT, TR_S_ENCODEHEXA, TR_S_DECODEHEXA, + TR_S_ENCODEBASE64, TR_S_DECODEBASE64, TR_S_ESCAPECOMMON, TR_S_UNESCAPECOMMON, TR_S_ESCAPEUSER, TR_S_UNESCAPEUSER, TR_S_ESCAPEPARAM, TR_S_UNESCAPEPARAM, TR_S_TOLOWER, TR_S_TOUPPER, TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE,

11 years, 8 months

git:master: modules/tm: Added branch_failure event route to tm documentation

by Juha Heinanen

Hugh Waite writes: - Can I do everything I can do in FAILURE_ROUTE in this event route? No. This event_route uses a new route type (a new BRANCH_FAILURE_ROUTE flag internally) which means functions and PVs are limited to ones that have this flag set. So far, I have enabled the functions that are required to enable outbound flow retries. Since this route is run in a very similar way to the failure_route, it is likely that most functions that work in a FAILURE_ROUTE will also work in a BRANCH_FAILURE_ROUTE just by enabling the flag, but it is a matter of whether they are appropriate for this route. hugh, i tried to enable two new functions on branch failure route by including the flag: {"t_branch_timeout", t_branch_timeout, 0, 0, FAILURE_ROUTE|BRANCH_FAILURE_ROUTE }, {"t_branch_replied", t_branch_replied, 0, 0, FAILURE_ROUTE|BRANCH_FAILURE_ROUTE }, but i still get to syslog: 0(29943) ERROR: <core> [cfg.y:3412]: misused command t_branch_timeout 0(29943) : <core> [cfg.y:3554]: parse error in config file /etc/sip-proxy/sip-proxy.cfg, line 2559, column 32: Command cannot be used in the block 0(29943) ERROR: <core> [cfg.y:3412]: misused command t_branch_replied 0(29943) : <core> [cfg.y:3554]: parse error in config file /etc/sip-proxy/sip-proxy.cfg, line 2559, column 55: Command cannot be used in the block what is it that i still need to do? -- juha

11 years, 8 months

git:master: snmpstats Update dev note

by Olle E. Johansson

Module: sip-router Branch: master Commit: dbb01573bc30eb59e712536d43c0caad357d90fa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dbb0157… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Apr 7 20:32:02 2013 +0200 snmpstats Update dev note --- modules/snmpstats/snmpSIPPortTable.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/snmpstats/snmpSIPPortTable.c b/modules/snmpstats/snmpSIPPortTable.c index 17524aa..89f88f4 100644 --- a/modules/snmpstats/snmpSIPPortTable.c +++ b/modules/snmpstats/snmpSIPPortTable.c @@ -29,6 +29,7 @@ * -------- * 2006-11-23 initial version (jmagder) * 2013-02-24 Added SCTP support (oej) + * 2013-04-07 Added IPv6 support (oej) * * Originally Generated with mib2c using mib2c.array-user.conf *

11 years, 8 months

git:master: lib/ kcore Make sure that the bytes waiting stats also report IPv6 sockets

by Olle E. Johansson

Module: sip-router Branch: master Commit: 5886fa623776eae7a33ff8777e68d29a170f0fac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5886fa6… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Apr 7 10:17:16 2013 +0200 lib/kcore Make sure that the bytes waiting stats also report IPv6 sockets --- lib/kcore/statistics.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/lib/kcore/statistics.c b/lib/kcore/statistics.c index 22fed2d..ec5c691 100644 --- a/lib/kcore/statistics.c +++ b/lib/kcore/statistics.c @@ -430,16 +430,27 @@ int get_total_bytes_waiting(void) int *UDPList = NULL; int *TCPList = NULL; int *TLSList = NULL; + int *UDP6List = NULL; + int *TCP6List = NULL; + int *TLS6List = NULL; int numUDPSockets = 0; int numTCPSockets = 0; int numTLSSockets = 0; + int numUDP6Sockets = 0; + int numTCP6Sockets = 0; + int numTLS6Sockets = 0; /* Extract out the IP address address for UDP, TCP, and TLS, keeping * track of the number of IP addresses from each transport */ numUDPSockets = get_socket_list_from_proto(&UDPList, PROTO_UDP); numTCPSockets = get_socket_list_from_proto(&TCPList, PROTO_TCP); numTLSSockets = get_socket_list_from_proto(&TLSList, PROTO_TLS); + + numUDP6Sockets = get_socket_list_from_proto_and_family(&UDP6List, PROTO_UDP, AF_INET6); + numTCP6Sockets = get_socket_list_from_proto_and_family(&TCP6List, PROTO_TCP, AF_INET6); + numTLS6Sockets = get_socket_list_from_proto_and_family(&TLS6List, PROTO_TLS, AF_INET6); + /* Deliberately not looking at PROTO_WS or PROTO_WSS here as they are just upgraded TCP/TLS connections */ @@ -449,22 +460,38 @@ int get_total_bytes_waiting(void) bytesWaiting += get_used_waiting_queue(1, TCPList, numTCPSockets); bytesWaiting += get_used_waiting_queue(1, TLSList, numTLSSockets); + bytesWaiting += get_used_waiting_queue(0, UDP6List, numUDP6Sockets); + bytesWaiting += get_used_waiting_queue(1, TCP6List, numTCP6Sockets); + bytesWaiting += get_used_waiting_queue(1, TLS6List, numTLS6Sockets); + /* get_socket_list_from_proto() allocated a chunk of memory, so we need * to free it. */ if (numUDPSockets > 0) { pkg_free(UDPList); } + if (numUDP6Sockets > 0) + { + pkg_free(UDP6List); + } if (numTCPSockets > 0) { pkg_free(TCPList); } + if (numTCP6Sockets > 0) + { + pkg_free(TCP6List); + } if (numTLSSockets > 0) { pkg_free(TLSList); } + if (numTLS6Sockets > 0) + { + pkg_free(TLS6List); + } return bytesWaiting; }

11 years, 8 months

git:master: modules/tm: load_contacts() now prefers contacts whose path is empty

by Juha Heinanen

Module: sip-router Branch: master Commit: 2a895f5dcfd5b7ce003e37b2b1db6690852e3ff5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2a895f5… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Apr 9 18:28:01 2013 +0300 modules/tm: load_contacts() now prefers contacts whose path is empty - For contacts with the same q, order contacts so that contacts that have empty path are preferred over ones that have path defined. In practice, this affects only contacts with the same ua instance id. --- modules/tm/t_serial.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_serial.c b/modules/tm/t_serial.c index bf87256..24f89ab 100644 --- a/modules/tm/t_serial.c +++ b/modules/tm/t_serial.c @@ -251,7 +251,9 @@ int t_load_contacts(struct sip_msg* msg, char* key, char* value) prev = (struct contact *)0; curr = contacts; - while (curr && (curr->q < branch->q)) { + while (curr && + ((curr->q < next->q) || + ((curr->q == next->q) && (next->path.len == 0)))) { prev = curr; curr = curr->next; }

11 years, 8 months

git:master: modules/rr: loose_route() return code 2 documentation

by Juha Heinanen

Module: sip-router Branch: master Commit: 34290a9be20cd5986a569caeba3a2fd0efbeeb1f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=34290a9… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Apr 9 17:25:59 2013 +0300 modules/rr: loose_route() return code 2 documentation --- modules/rr/README | 291 +++++++++++++++++++++++++++---------------- modules/rr/doc/rr_admin.xml | 9 ++- 2 files changed, 192 insertions(+), 108 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=342…

11 years, 8 months

git:master: modules/rr: new loose_route() result code

by Juha Heinanen

Module: sip-router Branch: master Commit: fd5a1d772cc08af05e669ee00e926ee488f734f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd5a1d7… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Apr 9 17:08:43 2013 +0300 modules/rr: new loose_route() result code - Introduced new loose_route() result code 2 that is returned if route calculation based on flow-token has been successful. --- modules/rr/loose.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/rr/loose.c b/modules/rr/loose.c index 64fb035..71f2465 100644 --- a/modules/rr/loose.c +++ b/modules/rr/loose.c @@ -47,6 +47,7 @@ #define RR_ERROR -1 /*!< An error occured while processing route set */ #define RR_DRIVEN 1 /*!< The next hop is determined from the route set */ +#define RR_OB_DRIVEN 2 /*!< The next hop is determined from the route set based on flow-token */ #define NOT_RR_DRIVEN -1 /*!< The next hop is not determined from the route set */ #define FLOW_TOKEN_BROKEN -2 /*!< Outbound flow-token shows evidence of tampering */ @@ -367,7 +368,7 @@ static inline int get_maddr_uri(str *uri, struct sip_uri *puri) return 0; /* sip: + maddr + : + port */ - if( (puri->maddr_val.len) > (127 - 6 - puri->port.len) ) + if( (puri->maddr_val.len) > (127 - 10) ) { LM_ERR( "Too long maddr parameter\n"); return RR_ERROR; @@ -704,7 +705,7 @@ static inline int after_strict(struct sip_msg* _m) if (res < 0) { LM_ERR("searching for last Route URI failed\n"); return RR_ERROR; - } else if (res > 0) { + } else if (res > 0) { /* No remote target is an error */ return RR_ERROR; } @@ -728,7 +729,7 @@ static inline int after_strict(struct sip_msg* _m) if (prev) { rem_off = prev->nameaddr.name.s + prev->len; rem_len = rt->nameaddr.name.s + rt->len - rem_off; - } else { + } else { rem_off = hdr->name.s; rem_len = hdr->len; } @@ -742,7 +743,10 @@ static inline int after_strict(struct sip_msg* _m) if(routed_params.len > 0) run_rr_callbacks( _m, &routed_params ); - return RR_DRIVEN; + if (use_ob == 1) + return RR_OB_DRIVEN; + else + return RR_DRIVEN; } @@ -907,7 +911,10 @@ got_uri: } } } - status = RR_DRIVEN; + if (use_ob == 1) + status = RR_OB_DRIVEN; + else + status = RR_DRIVEN; done: /* run RR callbacks only if we have Route URI parameters */

11 years, 8 months

Mediaproxy

by Olle E. Johansson

I think we need to make a decision regarding the mediaproxy module. The development team no longer supports Kamailio and I think the module doesn't support recent releases of the mediaproxy. Any thoughts? /O

11 years, 8 months

instance related crash in t_next_contacts()

by Juha Heinanen

i'm now getting a crash in t_next_contacts(). looks like instance value is corrupted: (gdb) where #0 0x00007f3cfa608cba in vfprintf () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x00007f3cfa69a000 in __vsyslog_chk () from /lib/x86_64-linux-gnu/libc.so.6 #2 0x00007f3cfa69a230 in syslog () from /lib/x86_64-linux-gnu/libc.so.6 #3 0x00007f3cf79cfcd9 in t_next_contacts (msg=0x7f3cfa0b5920, key=0x0, value=0x0) at t_serial.c:592 #4 0x000000000041bd9e in do_action (h=0x7fff77f12f90, a=0x7f3cf9e66690, msg=0x7f3cfa0b5920) at action.c:1074 #5 0x0000000000424414 in run_actions (h=0x7fff77f12f90, a=0x7f3cf9e62f50, msg=0x7f3cfa0b5920) at action.c:1573 #6 0x0000000000419fd2 in do_action (h=0x7fff77f12f90, a=0x7f3cf9e4d5c0, msg=0x7f3cfa0b5920) at action.c:690 #7 0x0000000000424414 in run_actions (h=0x7fff77f12f90, a=0x7f3cf9e4d420, msg=0x7f3cfa0b5920) at action.c:1573 #8 0x000000000041bd0a in do_action (h=0x7fff77f12f90, a=0x7f3cf9e4d7c0, msg=0x7f3cfa0b5920) at action.c:1065 #9 0x0000000000424414 in run_actions (h=0x7fff77f12f90, a=0x7f3cf9e23ae0, msg=0x7f3cfa0b5920) at action.c:1573 #10 0x0000000000419fd2 in do_action (h=0x7fff77f12f90, a=0x7f3cf9e16840, msg=0x7f3cfa0b5920) at action.c:690 #11 0x0000000000424414 in run_actions (h=0x7fff77f12f90, a=0x7f3cf9e147f0, msg=0x7f3cfa0b5920) at action.c:1573 #12 0x000000000041bd0a in do_action (h=0x7fff77f12f90, a=0x7f3cf9e17860, msg=0x7f3cfa0b5920) at action.c:1065 #13 0x0000000000424414 in run_actions (h=0x7fff77f12f90, a=0x7f3cf9df5690, msg=0x7f3cfa0b5920) at action.c:1573 #14 0x0000000000419fd2 in do_action (h=0x7fff77f12f90, a=0x7f3cf9d99000, msg=0x7f3cfa0b5920) at action.c:690 #15 0x0000000000424414 in run_actions (h=0x7fff77f12f90, a=0x7f3cf9d98e60, msg=0x7f3cfa0b5920) at action.c:1573 #16 0x000000000041bd0a in do_action (h=0x7fff77f12f90, a=0x7f3cf9d99200, msg=0x7f3cfa0b5920) at action.c:1065 #17 0x0000000000424414 in run_actions (h=0x7fff77f12f90, a=0x7f3cf9d73660, msg=0x7f3cfa0b5920) at action.c:1573 #18 0x0000000000419fd2 in do_action (h=0x7fff77f12f90, a=0x7f3cf9d2e970, msg=0x7f3cfa0b5920) at action.c:690 #19 0x0000000000424414 in run_actions (h=0x7fff77f12f90, a=0x7f3cf9d1e830, msg=0x7f3cfa0b5920) at action.c:1573 #20 0x0000000000419fd2 in do_action (h=0x7fff77f12f90, a=0x7f3cf9c390c0, msg=0x7f3cfa0b5920) at action.c:690 ---Type <return> to continue, or q <return> to quit--- #21 0x0000000000424414 in run_actions (h=0x7fff77f12f90, a=0x7f3cf9c390c0, msg=0x7f3cfa0b5920) at action.c:1573 #22 0x000000000041bd0a in do_action (h=0x7fff77f12f90, a=0x7f3cf9c391c0, msg=0x7f3cfa0b5920) at action.c:1065 #23 0x0000000000424414 in run_actions (h=0x7fff77f12f90, a=0x7f3cf9c06930, msg=0x7f3cfa0b5920) at action.c:1573 #24 0x0000000000419fd2 in do_action (h=0x7fff77f12f90, a=0x7f3cf9c04630, msg=0x7f3cfa0b5920) at action.c:690 #25 0x0000000000424414 in run_actions (h=0x7fff77f12f90, a=0x7f3cf9c04630, msg=0x7f3cfa0b5920) at action.c:1573 #26 0x000000000041bd0a in do_action (h=0x7fff77f12f90, a=0x7f3cf9c05720, msg=0x7f3cfa0b5920) at action.c:1065 #27 0x0000000000424414 in run_actions (h=0x7fff77f12f90, a=0x7f3cf9bf8da0, msg=0x7f3cfa0b5920) at action.c:1573 #28 0x0000000000424b83 in run_top_route (a=0x7f3cf9bf8da0, msg=0x7f3cfa0b5920, c=0x0) at action.c:1658 #29 0x000000000049d664 in receive_msg ( buf=0xa607f0 "INVITE sip:jh@test.fi SIP/2.0\r\nVia: SIP/2.0/TCP 188.67.45.249:46366;branch=z9hG4bK53dd425a53ef9f18;rport\r\nContact: <sip:0x9e4840@188.67.45.249:46366;transport=tcp>\r\nMax-Forwards: 16\r\nProxy-Authorizati"..., len=1275, rcv_info=0x7f3cec6c0688) at receive.c:209 #30 0x0000000000528513 in receive_tcp_msg ( tcpbuf=0x7f3cec6c0958 "INVITE sip:jh@test.fi SIP/2.0\r\nVia: SIP/2.0/TCP 188.67.45.249:46366;branch=z9hG4bK53dd425a53ef9f18;rport\r\nContact: <sip:0x9e4840@188.67.45.249:46366;transport=tcp>\r\nMax-Forwards: 70\r\nProxy-Authorizati"..., len=1275, rcv_info=0x7f3cec6c0688, con=0x7f3cec6c0670) at tcp_read.c:1218 #31 0x00000000005292ff in tcp_read_req (con=0x7f3cec6c0670, bytes_read=0x7fff77f133c0, read_flags=0x7fff77f133b8) at tcp_read.c:1373 #32 0x000000000052ab32 in handle_io (fm=0x7f3cfa349318, events=1, idx=-1) at tcp_read.c:1603 #33 0x0000000000523d59 in io_wait_loop_epoll (h=0x8d2180, t=2, repeat=0) at io_wait.h:1092 #34 0x000000000052b3cf in tcp_receive_loop (unix_sock=42) at tcp_read.c:1714 #35 0x000000000051e604 in tcp_init_children () at tcp_main.c:4969 #36 0x0000000000469619 in main_loop () at main.c:1714 #37 0x000000000046c2b4 in main (argc=17, argv=0x7fff77f13858) at main.c:2557 (gdb) (gdb) frame 3 #3 0x00007f3cf79cfcd9 in t_next_contacts (msg=0x7f3cfa0b5920, key=0x0, value=0x0) at t_serial.c:592 592 LM_INFO("Appending branch uri-'%.*s' dst-'%.*s' path-'%.*s' inst-'%.*s'\n", (gdb) print instance.len $1 = -102546075 on line 592 i changed LM_DBG to LM_INFO to find out why append_branch failed and crashed there. now it is crashing already on LM_INFO. there has been lots of instance related changed in t_serial since i did work on it and i don't know if this bug is an old one or introduced by the later work. -- juha

11 years, 8 months

← Newer
1
...
24
25
26
27
28
29
30
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013