sr-dev December 2011

sr-dev@lists.kamailio.org

32 participants
230 discussions

git:master: core: merged proto id to name functions

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a077f5e104fe92a1b3ea51dbf00589fc77c9666c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a077f5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 15 13:01:51 2011 +0100 core: merged proto id to name functions --- dst_blacklist.c | 18 ------------------ forward.c | 8 ++++++++ forward.h | 1 + ip_addr.c | 7 +++---- ip_addr.h | 3 ++- socket_info.c | 16 ++++++++-------- 6 files changed, 22 insertions(+), 31 deletions(-) diff --git a/dst_blacklist.c b/dst_blacklist.c index 0f7351d..024114d 100644 --- a/dst_blacklist.c +++ b/dst_blacklist.c @@ -937,24 +937,6 @@ void dst_blst_mem_info(rpc_t* rpc, void* ctx) -static char* get_proto_name(unsigned char proto) -{ - switch(proto){ - case PROTO_NONE: - return "*"; - case PROTO_UDP: - return "udp"; - case PROTO_TCP: - return "tcp"; - case PROTO_TLS: - return "tls"; - case PROTO_SCTP: - return "sctp"; - default: - return "unknown"; - } -} - #ifdef USE_DST_BLACKLIST_STATS diff --git a/forward.c b/forward.c index 690ff47..d3ecb00 100644 --- a/forward.c +++ b/forward.c @@ -399,6 +399,14 @@ static struct _check_self_func { struct _check_self_func *next; } *_check_self_func_list = NULL; +/* check if _check_self_func_list is set + * - return 1 if yes, 0 if no + */ +int is_check_self_func_list_set(void) +{ + return (_check_self_func_list)?1:0; +} + /* register a function to be called when matching for myself * - return 0 on success, -1 on error * - f must have same prototype as check_self() and return same kind of values diff --git a/forward.h b/forward.h index 7600535..674a6f0 100644 --- a/forward.h +++ b/forward.h @@ -105,6 +105,7 @@ int update_sock_struct_from_via( union sockaddr_union* to, int forward_reply( struct sip_msg* msg); +int is_check_self_func_list_set(void); /* params: diff --git a/ip_addr.c b/ip_addr.c index 502b4ea..06c57c3 100644 --- a/ip_addr.c +++ b/ip_addr.c @@ -337,7 +337,7 @@ int is_mcast(struct ip_addr* ip) * @param proto - protocol number * @return string with the protocol name or "unknown". */ -char* proto2a(enum sip_protos proto) +char* get_proto_name(unsigned int proto) { switch(proto){ case PROTO_NONE: @@ -350,8 +350,7 @@ char* proto2a(enum sip_protos proto) return "tls"; case PROTO_SCTP: return "sctp"; - case PROTO_OTHER: - return "other"; + default: + return "unknown"; } - return "unknown"; } diff --git a/ip_addr.h b/ip_addr.h index 86c2502..0c1a129 100644 --- a/ip_addr.h +++ b/ip_addr.h @@ -250,7 +250,8 @@ void print_ip(char* prefix, struct ip_addr* ip, char* suffix); void stdout_print_ip(struct ip_addr* ip); void print_net(struct net* net); -char* proto2a(enum sip_protos proto); +char* get_proto_name(unsigned int proto); +#define proto2a get_proto_name diff --git a/socket_info.c b/socket_info.c index 09aba4d..c0303b0 100644 --- a/socket_info.c +++ b/socket_info.c @@ -282,7 +282,7 @@ static void free_sock_info(struct socket_info* si) -static char* get_proto_name(unsigned short proto) +static char* get_valid_proto_name(unsigned short proto) { switch(proto){ case PROTO_NONE: @@ -325,7 +325,7 @@ int socket2str(char* s, int* len, struct socket_info* si) str proto; int l; - proto.s = get_proto_name(si->proto); + proto.s = get_valid_proto_name(si->proto); proto.len = strlen(proto.s); l = proto.len + si->address_str.len + si->port_no_str.len + 2; @@ -1650,7 +1650,7 @@ static int fix_socket_list(struct socket_info **list, int* type_flags) ){ if (si->flags & SI_IS_MCAST){ LOG(L_WARN, "WARNING: removing entry %s:%s [%s]:%s\n", - get_proto_name(si->proto), si->name.s, + get_valid_proto_name(si->proto), si->name.s, si->address_str.s, si->port_no_str.s); l = si; si=si->next; @@ -1662,7 +1662,7 @@ static int fix_socket_list(struct socket_info **list, int* type_flags) if (ail->flags & SI_IS_MCAST){ LOG(L_WARN, "WARNING: removing mh entry %s:%s" " [%s]:%s\n", - get_proto_name(si->proto), ail->name.s, + get_valid_proto_name(si->proto), ail->name.s, ail->address_str.s, si->port_no_str.s); tmp_ail=ail; ail=ail->next; @@ -1866,7 +1866,7 @@ void print_all_socket_lists() for(si=list?*list:0; si; si=si->next){ if (si->addr_info_lst){ printf(" %s: (%s", - get_proto_name(proto), + get_valid_proto_name(proto), si->address_str.s); for (ai=si->addr_info_lst; ai; ai=ai->next) printf(", %s", ai->address_str.s); @@ -1876,7 +1876,7 @@ void print_all_socket_lists() si->flags & SI_IS_MHOMED? " mhomed" : ""); }else{ printf(" %s: %s", - get_proto_name(proto), + get_valid_proto_name(proto), si->name.s); if (!si->flags & SI_IS_IP) printf(" [%s]", si->address_str.s); @@ -1896,10 +1896,10 @@ void print_aliases() for(a=aliases; a; a=a->next) if (a->port) - printf(" %s: %.*s:%d\n", get_proto_name(a->proto), + printf(" %s: %.*s:%d\n", get_valid_proto_name(a->proto), a->alias.len, a->alias.s, a->port); else - printf(" %s: %.*s:*\n", get_proto_name(a->proto), + printf(" %s: %.*s:*\n", get_valid_proto_name(a->proto), a->alias.len, a->alias.s); }

13 years

git:master: core: added rpc commands to list listen sockets and name aliases

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a6c83dd424ba65bf5599f9bbd9e736a8d27a1128 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a6c83dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 15 13:03:00 2011 +0100 core: added rpc commands to list listen sockets and name aliases - core.sockets_list - core.aliases_list --- core_cmd.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/core_cmd.c b/core_cmd.c index bd7e2eb..9914737 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -37,6 +37,9 @@ #include "dprint.h" #include "core_cmd.h" #include "globals.h" +#include "forward.h" +#include "socket_info.h" +#include "name_alias.h" #include "pt.h" #include "ut.h" #include "tcp_info.h" @@ -974,6 +977,96 @@ static void core_udp4rawinfo(rpc_t* rpc, void* c) #endif /* USE_RAW_SOCKS */ } +/** + * + */ +static const char* core_aliases_list_doc[] = { + "List local SIP server host aliases", /* Documentation string */ + 0 /* Method signature(s) */ +}; + +/** + * list the name aliases for SIP server + */ +static void core_aliases_list(rpc_t* rpc, void* c) +{ + void *hr; + void *ha; + struct host_alias* a; + + rpc->add(c, "{", &hr); + rpc->struct_add(hr, "s", + "myself_callbacks", is_check_self_func_list_set()?"yes":"no"); + for(a=aliases; a; a=a->next) { + rpc->struct_add(hr, "{", "alias", &ha); + rpc->struct_add(ha, "sS", + "proto", proto2a(a->proto), + "address", &a->alias + ); + if (a->port) + rpc->struct_add(ha, "d", + "port", a->port); + else + rpc->struct_add(ha, "s", + "port", "*"); + } +} + +/** + * + */ +static const char* core_sockets_list_doc[] = { + "List local SIP server listen sockets", /* Documentation string */ + 0 /* Method signature(s) */ +}; + +/** + * list listen sockets for SIP server + */ +static void core_sockets_list(rpc_t* rpc, void* c) +{ + void *hr; + void *ha; + struct socket_info *si; + struct socket_info** list; + struct addr_info* ai; + unsigned short proto; + + proto=PROTO_UDP; + rpc->add(c, "{", &hr); + do{ + list=get_sock_info_list(proto); + for(si=list?*list:0; si; si=si->next){ + rpc->struct_add(hr, "{", "socket", &ha); + if (si->addr_info_lst){ + rpc->struct_add(ha, "ss", + "proto", get_proto_name(proto), + "address", si->address_str.s); + for (ai=si->addr_info_lst; ai; ai=ai->next) + rpc->struct_add(ha, "ss", + "address", ai->address_str.s); + rpc->struct_add(ha, "sss", + "proto", si->port_no_str.s, + "mcast", si->flags & SI_IS_MCAST ? "yes" : "no", + "mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no"); + } else { + printf(" %s: %s", + get_proto_name(proto), + si->name.s); + rpc->struct_add(ha, "ss", + "proto", get_proto_name(proto), + "address", si->name.s); + if (!si->flags & SI_IS_IP) + rpc->struct_add(ha, "ss", + "ipaddress", si->address_str.s); + rpc->struct_add(ha, "sss", + "proto", si->port_no_str.s, + "mcast", si->flags & SI_IS_MCAST ? "yes" : "no", + "mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no"); + } + } + } while((proto=next_proto(proto))); +} /* @@ -1013,6 +1106,8 @@ static rpc_export_t core_rpc_methods[] = { {"core.sctp_info", core_sctpinfo, core_sctpinfo_doc, 0}, {"core.udp4_raw_info", core_udp4rawinfo, core_udp4rawinfo_doc, 0}, + {"core.aliases_list", core_aliases_list, core_aliases_list_doc, 0}, + {"core.sockets_list", core_sockets_list, core_sockets_list_doc, 0}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 },

13 years

[tracker] Comment added: bad sotket after re-register in location table

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#191 - bad sotket after re-register in location table User who did this - David Kovarik (kovik) ---------- kamailio -V version: kamailio 3.2.1 (x86_64/linux) 918035-dirty flags: STATS: Off, USE_IPV6, USE_TCP, USE_TLS, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, DBG_QM_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 4MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 918035 -dirty compiled on 14:33:55 Dec 12 2011 with gcc 4.4.5 root@serZ2:/# uname -a Linux serZ2 2.6.32-5-vserver-amd64 #1 SMP Tue Jun 14 11:50:10 UTC 2011 x86_64 GNU/Linux ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=191#comment465 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.

13 years

[tracker] Comment added: bad sotket after re-register in location table (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#191 - bad sotket after re-register in location table User who did this - David Kovarik (kovik) ---------- it is random good/bad, my phone is reregister after 60s for test. +--------------------------+----------------------+--------------------------------------------------+---------------------+-------------------------------+ | received | socket | user_agent | expires | contact | +--------------------------+----------------------+--------------------------------------------------+---------------------+-------------------------------+ | sip:85.135.106.202:55062 | udp:81.31.45.57 060 | Linksys/SPA941-5.1.8 | 2011-12-15 00:23:17 | sip:413205@192.168.2.103:5061 | | sip:85.135.106.202:4078 | udp:81.31.45.57:5060 | Well T20 hw7.0.0.54 fw9.60.9.5 00:15:65:15:ae:b2 | 2011-12-15 00:23:47 | sip:300169@192.168.2.101:5062 | +--------------------------+----------------------+--------------------------------------------------+---------------------+-------------------------------+ ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=191#comment464 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.

13 years

git:master: core/timer: added support for basic mili-second timers

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2f38f2c316bc3c0410ac1bd61747ca8c69480937 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f38f2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 14 23:18:36 2011 +0100 core/timer: added support for basic mili-second timers - renamed second-based timer functions from dummy to basic --- timer.h | 2 ++ timer_proc.c | 51 +++++++++++++++++++++++++++++++++++++++++++++------ timer_proc.h | 35 +++++++++++++++++++++++++++++------ 3 files changed, 76 insertions(+), 12 deletions(-) diff --git a/timer.h b/timer.h index 4adcc8e..d2ba3dd 100644 --- a/timer.h +++ b/timer.h @@ -76,6 +76,8 @@ typedef void (timer_function)(unsigned int ticks, void* param); timer_ticks.h (.e.g TICKS_TO_S(tick) to convert to s or ms )*/ #define TIMER_TICK 1 /* 1 s, kept for compatibility */ +/*function prototype to execute on mili-second based basic timers */ +typedef void (utimer_function)(unsigned int uticks, void* param); struct timer_ln; /* forward decl */ /* new diff --git a/timer_proc.c b/timer_proc.c index 36e4836..c354fbd 100644 --- a/timer_proc.c +++ b/timer_proc.c @@ -38,17 +38,18 @@ #include "timer_proc.h" #include "cfg/cfg_struct.h" #include "pt.h" +#include "ut.h" #include "mem/shm_mem.h" #include <unistd.h> /** - * \brief update internal counters for running new dummy timers - * @param timers number of dummy timer processes + * \brief update internal counters for running new basic sec. timers + * @param timers number of basic timer processes * @return 0 on success; -1 on error */ -int register_dummy_timers(int timers) +int register_basic_timers(int timers) { if(register_procs(timers)<0) return -1; @@ -61,9 +62,9 @@ int register_dummy_timers(int timers) * * Forks a very basic periodic timer process, that just sleep()s for * the specified interval and then calls the timer function. - * The new "dummy timer" process execution start immediately, the sleep() + * The new "basic timer" process execution start immediately, the sleep() * is called first (so the first call to the timer function will happen - * \<interval\> seconds after the call to fork_dummy_timer) + * \<interval\> seconds after the call to fork_basic_timer) * @param child_id @see fork_process() * @param desc @see fork_process() * @param make_sock @see fork_process() @@ -73,7 +74,7 @@ int register_dummy_timers(int timers) * @return pid of the new process on success, -1 on error * (doesn't return anything in the child process) */ -int fork_dummy_timer(int child_id, char* desc, int make_sock, +int fork_basic_timer(int child_id, char* desc, int make_sock, timer_function* f, void* param, int interval) { int pid; @@ -94,6 +95,44 @@ int fork_dummy_timer(int child_id, char* desc, int make_sock, return pid; } +/** + * \brief Forks a separate simple milisecond-sleep() periodic timer + * + * Forks a very basic periodic timer process, that just ms-sleep()s for + * the specified interval and then calls the timer function. + * The new "basic timer" process execution start immediately, the ms-sleep() + * is called first (so the first call to the timer function will happen + * \<interval\> seconds after the call to fork_basic_utimer) + * @param child_id @see fork_process() + * @param desc @see fork_process() + * @param make_sock @see fork_process() + * @param f timer function/callback + * @param param parameter passed to the timer function + * @param uinterval interval in mili-seconds. + * @return pid of the new process on success, -1 on error + * (doesn't return anything in the child process) + */ +int fork_basic_utimer(int child_id, char* desc, int make_sock, + utimer_function* f, void* param, int uinterval) +{ + int pid; + ticks_t ts; + + pid=fork_process(child_id, desc, make_sock); + if (pid<0) return -1; + if (pid==0){ + /* child */ + if (cfg_child_init()) return -1; + for(;;){ + sleep_us(uinterval); + cfg_update(); + ts = get_ticks_raw(); + f(TICKS_TO_MS(ts), param); /* ticks in mili-seconds */ + } + } + /* parent */ + return pid; +} /** diff --git a/timer_proc.h b/timer_proc.h index b6c9a66..e6faa7c 100644 --- a/timer_proc.h +++ b/timer_proc.h @@ -35,21 +35,24 @@ #include "local_timer.h" /** - * \brief update internal counters for running new dummy timers - * @param timers number of dummy timer processes + * \brief update internal counters for running new basic sec. timers + * @param timers number of basic timer processes * @return 0 on success; -1 on error */ -int register_dummy_timers(int timers); +int register_basic_timers(int timers); +#define register_dummy_timers register_basic_timers + +#define register_basic_utimers register_basic_utimers /** * \brief Forks a separate simple sleep() periodic timer * * Forks a very basic periodic timer process, that just sleep()s for * the specified interval and then calls the timer function. - * The new "dummy timer" process execution start immediately, the sleep() + * The new "basic timer" process execution start immediately, the sleep() * is called first (so the first call to the timer function will happen - * \<interval\> seconds after the call to fork_dummy_timer) + * \<interval\> seconds after the call to fork_basic_timer) * @param child_id @see fork_process() * @param desc @see fork_process() * @param make_sock @see fork_process() @@ -59,11 +62,31 @@ int register_dummy_timers(int timers); * @return pid of the new process on success, -1 on error * (doesn't return anything in the child process) */ -int fork_dummy_timer(int child_id, char* desc, int make_sock, +int fork_basic_timer(int child_id, char* desc, int make_sock, timer_function* f, void* param, int interval); +#define fork_dummy_timer fork_basic_timer /** + * \brief Forks a separate simple milisecond-sleep() periodic timer + * + * Forks a very basic periodic timer process, that just ms-sleep()s for + * the specified interval and then calls the timer function. + * The new "basic timer" process execution start immediately, the ms-sleep() + * is called first (so the first call to the timer function will happen + * \<interval\> seconds after the call to fork_basic_utimer) + * @param child_id @see fork_process() + * @param desc @see fork_process() + * @param make_sock @see fork_process() + * @param f timer function/callback + * @param param parameter passed to the timer function + * @param uinterval interval in mili-seconds. + * @return pid of the new process on success, -1 on error + * (doesn't return anything in the child process) + */ +int fork_basic_utimer(int child_id, char* desc, int make_sock, + timer_function* f, void* param, int uinterval); +/** * \brief Forks a timer process based on the local timer * * Forks a separate timer process running a local_timer.h type of timer

13 years

XMPP Jingle support status?

by kasip＠elektromaniak.wz.cz

Hi! I stumbled upon http://jitsi.org/index.php/GSOC2011/KamailioJingle What is the current status? Has the project advanced? Jingle support would make my life way easier. If time / alternative summer job permits, all I care for is the functionality. Doing that while google pays would be more like sweet bonus. Thanks for answer.

13 years

[tracker] Comment added: bad sotket after re-register in location table

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#191 - bad sotket after re-register in location table User who did this - Daniel-Constantin Mierla (miconda) ---------- Can you provide the log messages with debug=3? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=191#comment463 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.

13 years

Siremis v3.2.0 Released

by Elena-Ramona Modroiu

Hi, Siremis v3.2.0 is out - the web management interface for Kamailio and SER v3.2.x series. Besides updates to existing views to match the database schema in Kamailio v3.2.x (such as lcr, dialog or siptrace), there are many new features. Among most important: - SQL-based CDR rating engine for billing purposes, with views to manage the rating rules - charts and table summaries to reflect the activity of accounting records - new views to manage records for remote registrations, mtree and global black list - command line tools to add new database table views in a step-by-step wizard fashion - selection of usernames and domains for many views can be done by a select box or picker form with values from subscriber or domain tables More details can be find in the announcement of the release on the web site: * http://asipto.com/u/4t or in the ChangeLog inside the tarball. Siremis can be downloaded from: * http://asipto.com/u/sd Alternative download site, along with the GIT repository for Siremis, is offered at sourceforge.net project: * http://sourceforge.net/projects/siremis/ Regards, Ramona

13 years

git:tma0/iptrtpproxy-v2: RTP proxy PRACK without SDP fix

by Tomas Mandys

Module: sip-router Branch: tma0/iptrtpproxy-v2 Commit: df7555de5100e9571f0b7d32132a25e85cdb58c4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df7555d… Author: Tomas Mandys <tomas.mandys(a)iptel.org> Committer: Tomas Mandys <tomas.mandys(a)iptel.org> Date: Wed Dec 14 20:52:37 2011 +0100 RTP proxy PRACK without SDP fix - new flag added to cope with 180/PRACK without SDP --- .../oob/sip-router-oob-RTPPROXY.cfg.inc | 44 ++++++++++++++------ 1 files changed, 31 insertions(+), 13 deletions(-) diff --git a/modules/iptrtpproxy/oob/sip-router-oob-RTPPROXY.cfg.inc b/modules/iptrtpproxy/oob/sip-router-oob-RTPPROXY.cfg.inc index 34baf2c..41f0f10 100644 --- a/modules/iptrtpproxy/oob/sip-router-oob-RTPPROXY.cfg.inc +++ b/modules/iptrtpproxy/oob/sip-router-oob-RTPPROXY.cfg.inc @@ -22,6 +22,7 @@ # $rtp_dlg_sess_ids ... list of confirmed (INVITE/200OK/ACK, INVITE/180/PRACK, UPDATE/200OK ) RTP sessions # $rtp_dlg_sess_ids2 ... list of non-confirmed sessions # $rtp_method_flag ... request method passed to onreply/failure +# $rtp_dlg_state ... ""..no offer yet, "o"..offered, "a"..answered # # rtpproxy.* configuration params # @@ -35,7 +36,7 @@ loadmodule "iptrtpproxy" modparam("iptrtpproxy", "config", "/etc/iptrtpproxy.cfg"); #DEBCONF-RTTPPROXY-START -modparam("iptrtpproxy", "switchboard", "name=*;sip-addr=213.192.59.75"); ## TODO change back to .75 +modparam("iptrtpproxy", "switchboard", "name=*;sip-addr=213.192.30.136"); #modparam("iptrtpproxy", "switchboard", "name=gate_a;sip-addr=1.2.3.4;aggregation=AA") #modparam("iptrtpproxy", "switchboard", "name=gate_b;aggregation=A") modparam("iptrtpproxy", "codec_set", "name=any;media_type=*;rights=0;codecs=*;max_streams=9999"); @@ -81,7 +82,7 @@ route[RTPPROXY_PROCESS_REQUEST] { } if (!defined $dialog_id) { # AVP loaded from route cookie if (@method != "ACK") - t_reply("400", "Missing cookie"); # 500 (=our bug) in case of init request because it'd been generated by ourselves + t_reply("400", "Missing cookie"); # 500 (=our bug) in case of init request because it had been generated by ourselves xlog("L_EDEBUG", "RTPPROXY_PROCESS_REQUEST: missing cookie: %(a)hf_value.route[0]\n"); drop; } @@ -125,7 +126,7 @@ route[RTPPROXY_PROCESS_REQUEST] { } } - if ((method == "INVITE" || method == "UPDATE") && @msg.body!="") { + if ((method == "INVITE" || method == "UPDATE" || method == "PRACK") && @msg.body!="") { if (@iptrtpproxy.active_media_num == "0") break; iptrtpproxy_set_param("codec_set", "@cfg_get.rtp_proxy.codec_set"); iptrtpproxy_set_param("remove_codec_mask", "1"); @@ -146,7 +147,7 @@ route[RTPPROXY_PROCESS_REQUEST] { xlog("L_EDEBUG", "RTPPROXY_PROCESS_REQUEST: find switchboard-a for '%(a)received.ip'\n"); if (!iptrtpproxy_set_param("switchboard_by_sip_ip_a", "@received.ip")) { xlog("L_ERR", "RTPPROXY_PROCESS_REQUEST: Cannot find switchboard-a for routing '%(a)received.ip'\n"); - t_reply("500", "RTP proxy error"); + t_reply("500", "RTP proxy error (switchboard-a)"); drop; } eval_push("x:%@next_hop.src_ip"); @@ -157,7 +158,7 @@ route[RTPPROXY_PROCESS_REQUEST] { xlog("L_EDEBUG", "RTPPROXY_PROCESS_REQUEST: find switchboard-b for '%(a)eval.get[-1]'\n"); if (!iptrtpproxy_set_param("switchboard_by_sip_ip_b", "@eval.get[-1]")) { xlog("L_ERR", "RTPPROXY_PROCESS_REQUEST: Cannot find switchboard for routing '%(a)eval.get[-1]'\n"); - t_reply("500", "RTP proxy error"); + t_reply("500", "RTP proxy error (switchboard-b)"); drop; } } @@ -215,16 +216,19 @@ route[RTPPROXY_PROCESS_REQUEST] { } else { eval_push("1"); # caller -> callee } - if (!iptrtpproxy_alloc("@eval.pop[-1]")) { - t_reply("500", "RTP proxy error"); + if (!iptrtpproxy_alloc("@eval.pop[-1]")) { + t_reply("503", "RTP proxy error (no free port)"); drop; } # we need save in dialog as non-confirmed sess_ids (not only in transaction) because # UPDATE in non-confirmed INVITE and ACK to 200OK are considered as separate transactions. - if (@iptrtpproxy.session_ids != "") + if (@iptrtpproxy.session_ids != "") { $rtp_dlg_sess_ids2 = @iptrtpproxy.session_ids; - else + $rtp_dlg_state = "o"; # offered + } else { del_attr("$rtp_dlg_sess_ids2"); + del_attr("$rtp_dlg_state"); + } xlog("L_EDEBUG", "RTPPROXY_PROCESS_REQUEST: allocated ids2=%$rtp_dlg_sess_ids2\n"); # session_ids are stored in AVP to let commit (on_reply) or rollback (on_failure) allocated sessions @@ -245,10 +249,14 @@ route[RTPPROXY_PROCESS_REQUEST] { if (strempty($rtp_dlg_sess_ids2)) { break; /* do not save, non SDP related re-INVITE or retrasmission which is not eaten by tm module, SDP in ACK is not supported */ } + if (!defined $rtp_dlg_state || $rtp_dlg_state != "a") { + break; /* e.g. PRACK to 180 without SDP */ + } iptrtpproxy_set_param("protected_session_ids", "$rtp_dlg_sess_ids2"); iptrtpproxy_delete("$rtp_dlg_sess_ids"); $rtp_dlg_sess_ids = $rtp_dlg_sess_ids2; del_attr("$rtp_dlg_sess_ids2"); + del_attr("$rtp_dlg_state"); route("RTPPROXY_SAVE_ATTRS"); } else if (method == "BYE") { # CANCEL ??? @@ -291,7 +299,7 @@ route[RTPPROXY_PROCESS_REPLY] { # (probably) no retransmission route("RTPPROXY_LOAD_ATTRS"); $rtp_last_code = @msg.res.code; - if (isflagset(FLAG_INIT_DLG) && status=~"18[0-9]") { + if (isflagset(FLAG_INIT_DLG) && status=~"1[0-9][0-9]") { # 100 is impossible, eaten by tm iptrtpproxy_set_param("learning_timeout", "@cfg_get.rtp_proxy.ringing_timeout"); } else { @@ -342,6 +350,7 @@ route[RTPPROXY_PROCESS_REPLY] { ; # drop; ??? } + $rtp_dlg_state = "a"; # answered route("RTPPROXY_SAVE_ATTRS"); } else { @@ -362,9 +371,13 @@ route[RTPPROXY_PROCESS_REPLY] { else if ($rtp_method_flag == "UPDATE" && status=~"2[0-9][0-9]" && $rtp_dlg_sess_ids2!="") { # confirm pending offer (UPDATE is not followed by ACK/PRACK) route("RTPPROXY_LOAD_ATTRS"); - xlog("L_EDEBUG", "RTPPROXY_PROCESS_REPLY: %@method, delete(ids=%$rtp_dlg_sess_ids), protect(ids2=%$rtp_dlg_sess_ids2)\n"); + xlog("L_EDEBUG", "RTPPROXY_PROCESS_REPLY: %@method, delete(ids=%$rtp_dlg_sess_ids), protect(ids2=%$rtp_dlg_sess_ids2, state=%$rtp_dlg_state)\n"); + if (!defined $rtp_dlg_state || $rtp_dlg_state != "o") { + break; + } iptrtpproxy_set_param("protected_session_ids", "$rtp_dlg_sess_ids2"); iptrtpproxy_delete("$rtp_dlg_sess_ids"); + $rtp_dlg_state = "a"; # answered $rtp_dlg_sess_ids = $rtp_dlg_sess_ids2; del_attr("$rtp_dlg_sess_ids2"); route("RTPPROXY_SAVE_ATTRS"); @@ -385,13 +398,14 @@ route[RTPPROXY_PROCESS_FAILURE] { iptrtpproxy_delete("$rtp_dlg_sess_ids"); # early media are considered as confirmed iptrtpproxy_delete("$rtp_dlg_sess_ids2"); route("RTPPROXY_REMOVE_ATTRS"); - } else if ($rtp_method_flag == "INVITE" || $rtp_method_flag == "UPDATE") { + } else if ($rtp_method_flag == "INVITE" || $rtp_method_flag == "UPDATE" || $rtp_method_flag == "PRACK") { route("RTPPROXY_LOAD_ATTRS"); #remove only unconfirmed sessiosn xlog("L_EDEBUG", "RTPPROXY_PROCESS_FAILURE: %@method, delete(ids2=%$rtp_dlg_sess_ids2), protect(ids=%$rtp_dlg_sess_ids)\n"); iptrtpproxy_set_param("protected_session_ids", "$rtp_dlg_sess_ids"); iptrtpproxy_delete("$rtp_dlg_sess_ids2"); del_attr("$rtp_dlg_sess_ids2"); + del_attr("$rtp_dlg_state"); route("RTPPROXY_SAVE_ATTRS"); } @@ -407,23 +421,27 @@ route[RTPPROXY_PROCESS_FAILURE] { route[RTPPROXY_LOAD_ATTRS] { del_attr("$rtp_dlg_sess_ids"); del_attr("$rtp_dlg_sess_ids2"); + del_attr("$rtp_dlg_state"); load_extra_attrs("rtp_dlg", "$dialog_id"); - xlog("L_EDEBUG", "RTPPROXY_LOAD_ATTRS: dialog_id=%$dialog_id, method/flag='%@method'/'%$rtp_method_flag', ids=%$rtp_dlg_sess_ids, ids2=%$rtp_dlg_sess_ids2\n"); + xlog("L_EDEBUG", "RTPPROXY_LOAD_ATTRS: dialog_id=%$dialog_id, method/flag='%@method'/'%$rtp_method_flag', ids=%$rtp_dlg_sess_ids, ids2=%$rtp_dlg_sess_ids2, state=%$rtp_dlg_state\n"); } route[RTPPROXY_SAVE_ATTRS] { xlog("L_EDEBUG", "RTPPROXY_SAVE_ATTRS: dialog_id=%$dialog_id, method='%@method', ids=%$rtp_dlg_sess_ids, ids2=%$rtp_dlg_sess_ids2\n"); setavpflag("$f.rtp_dlg_sess_ids", "rtpproxy_dlg"); setavpflag("$f.rtp_dlg_sess_ids2", "rtpproxy_dlg"); + setavpflag("$f.rtp_dlg_state", "rtpproxy_dlg"); save_extra_attrs("rtp_dlg", "$dialog_id"); del_attr("$rtp_dlg_sess_ids"); del_attr("$rtp_dlg_sess_ids2"); + del_attr("$rtp_dlg_state"); } route[RTPPROXY_REMOVE_ATTRS] { xlog("L_EDEBUG", "RTPPROXY_REMOVE_ATTRS: dialog_id=%$dialog_id, method='%@method'\n"); del_attr("$rtp_dlg_sess_ids"); del_attr("$rtp_dlg_sess_ids2"); + del_attr("$rtp_dlg_state"); remove_extra_attrs("rtp_dlg", "$dialog_id"); }

13 years

Re: [sr-dev] db_fetch_next problem with Postgres?

by Paul Pankhurst

should have sent this to list – sorry From: Paul Pankhurst Sent: Tuesday, December 13, 2011 12:03 PM To: miconda(a)gmail.com Subject: Re: [sr-dev] db_fetch_next problem with Postgres? Hi Daniel, I have a bit more information... the outline pseudo code for what I am doing looks like this (removing non relevant stuff) db_fetch_query( xcap_db ) do { query( another_2nd_db ) } while ( db_fetch_next( xcap_db) ) it is the query to the second database that breaks everything...if I remove it the problem goes away and db_fetch_next works as expected. The access to the 2nd database uses completely different db_func_t and db1_cont_t structures to the xcap_db I’ll try running it with extra debug shortly to see if I can see what’s happening Paul From: Daniel-Constantin Mierla Sent: Tuesday, December 13, 2011 11:10 AM To: Development mailing list of the sip-router project Cc: Paul Pankhurst Subject: Re: [sr-dev] db_fetch_next problem with Postgres? Hello, On 12/13/11 11:40 AM, Paul Pankhurst wrote: I am having problems with the db_fetch_next routine and Postgres. I can’t see any problem with my code that calls it, and as far as I can tell the problem appears to be in the db_postgres_fetch_result routine. On the first invocation of db_postgres_fetch_result it allocates a result structure and gives me the first 5 rows of the 198 that match my query after calling db_postgres_convert_rows. On the 2nd invocation it fails to retrieve the next 5 rows because CON_RESULT(_con) is NULL ! Anyone got any suggestions? can you doublecheck and see if you don't call free_result() before fetching the next rows? If you run with debug=3, if there is a free_result, you should see the log message from: LM_DBG("PQclear(%p) result set\n", CON_RESULT(_con)) Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com http://linkedin.com/in/miconda -- http://twitter.com/miconda

13 years

← Newer
1
...
9
10
11
12
13
14
15
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2011