sr-dev November 2009

sr-dev@lists.kamailio.org

30 participants
177 discussions

git:sr_3.0: core: added id to every field of gw table schema
by Juha Heinanen 06 Nov '09

06 Nov '09

Module: sip-router Branch: sr_3.0 Commit: a3a3ce31042a025fe93520350e53b049d5ef850d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3a3ce3… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Nov 6 05:58:59 2009 +0200 core: added id to every field of gw table schema --- lib/srdb1/schema/gw.xml | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/srdb1/schema/gw.xml b/lib/srdb1/schema/gw.xml index bb2c354..a457719 100644 --- a/lib/srdb1/schema/gw.xml +++ b/lib/srdb1/schema/gw.xml @@ -47,14 +47,14 @@ <description>ID of gateway's group</description> </column> - <column> + <column id="ip_addr"> <name>ip_addr</name> <type>string</type> <size>15</size> <description>IP Address of the gateway</description> </column> - <column> + <column id="hostname"> <name>hostname</name> <type>string</type> <size>64</size> @@ -62,35 +62,35 @@ <description>Hostname of the gateway</description> </column> - <column> + <column id="port"> <name>port</name> <type>unsigned short</type> <null/> <description>Port of the gateway</description> </column> - <column> + <column id="uri_scheme"> <name>uri_scheme</name> <type>unsigned char</type> <null/> <description>URI scheme of gateway</description> </column> - <column> + <column id="transport"> <name>transport</name> <type>unsigned char</type> <null/> <description>Transport type to be used for the gateway</description> </column> - <column> + <column id="strip"> <name>strip</name> <type>unsigned char</type> <null/> <description>The number of digits to strip from Request URI user part before inserting tag</description> </column> - <column> + <column id="tag"> <name>tag</name> <type>string</type> <size>16</size> @@ -99,21 +99,21 @@ <description>Request URI user part tag</description> </column> - <column> + <column id="weight"> <name>weight</name> <type>unsigned int</type> <null/> <description>Weight of gateway within gw_grp. Valid values are 1-254.</description> </column> - <column> + <column id="flags"> <name>flags</name> <type>unsigned int</type> <default>&DEFAULT_FLAGS;</default> <description>Gateway specific flags</description> </column> - <column> + <column id="defunct"> <name>defunct</name> <type>unsigned int</type> <null/>

1 0

default memdbg and memlog
by Klaus Darilion 05 Nov '09

05 Nov '09

Hi! IMO it would be better to increase the default value of memdbg and memlog to 4 (L_DBG+1) to avoid the memory log messages in debug=3 mode. I often use debug=3 to hunt down script or sip-router errors and I am not interested in memory debugging. I think this confuses many new sip-router users too. regards klaus

1 0

git:sr_3.0: tcp: use the forced socket ip as source
by Andrei Pelinescu-Onciul 05 Nov '09

05 Nov '09

Module: sip-router Branch: sr_3.0 Commit: 6fcba958595c5189c1b9d97c8fc4c9f434a3c7ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6fcba95… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 5 16:21:35 2009 +0100 tcp: use the forced socket ip as source - if a socket is forced always use the forced socket ip as source (if a connection exists with different ip as source, open a new one with the forced ip). --- forward.h | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/forward.h b/forward.h index 2a6e91e..b365753 100644 --- a/forward.h +++ b/forward.h @@ -123,6 +123,11 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) { struct dest_info new_dst; str outb; +#ifdef USE_TCP + union sockaddr_union* from; + union sockaddr_union local_addr; +#endif + outb.s = buf; outb.len = len; sr_event_exec(SREV_NET_DATA_OUT, (void*)&outb); @@ -152,7 +157,14 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) " support is disabled\n"); goto error; }else{ - if (unlikely(tcp_send(dst, 0, outb.s, outb.len)<0)){ + from=0; + if (unlikely((dst->send_flags & SND_F_FORCE_SOCKET) && + dst->send_sock)) { + local_addr=dst->send_sock->su; + su_setport(&local_addr, 0); /* any local port will do */ + from=&local_addr; + } + if (unlikely(tcp_send(dst, from, outb.s, outb.len)<0)){ STATS_TX_DROPS; LOG(L_ERR, "msg_send: ERROR: tcp_send failed\n"); goto error; @@ -167,7 +179,14 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) " support is disabled\n"); goto error; }else{ - if (unlikely(tcp_send(dst, 0, outb.s, outb.len)<0)){ + from=0; + if (unlikely((dst->send_flags & SND_F_FORCE_SOCKET) && + dst->send_sock)) { + local_addr=dst->send_sock->su; + su_setport(&local_addr, 0); /* any local port will do */ + from=&local_addr; + } + if (unlikely(tcp_send(dst, from, outb.s, outb.len)<0)){ STATS_TX_DROPS; LOG(L_ERR, "msg_send: ERROR: tcp_send failed\n"); goto error;

1 0

db_flatstore debian packages overlap
by Klaus Darilion 05 Nov '09

05 Nov '09

Hi! Bug: db_flatstore is in db_modules package and ser standard package I think it should be removed from db_modules packages as it does not have any dependencies on db-libraries. regards klaus

1 0

git:sr_3.0: textops(k): msg_apply_changes: preserve the send flags
by Andrei Pelinescu-Onciul 05 Nov '09

05 Nov '09

Module: sip-router Branch: sr_3.0 Commit: 79ba45449704df8fd21740b216fed710e1bd5101 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=79ba454… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 5 15:17:56 2009 +0100 textops(k): msg_apply_changes: preserve the send flags - restore also the msg send flags --- modules_k/textops/textops.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/textops/textops.c b/modules_k/textops/textops.c index bc7bdcd..5fe9469 100644 --- a/modules_k/textops/textops.c +++ b/modules_k/textops/textops.c @@ -1903,6 +1903,8 @@ static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2) msg->flags = tmp.flags; msg->msg_flags = tmp.msg_flags; msg->force_send_socket = tmp.force_send_socket; + msg->fwd_send_flags = tmp.fwd_send_flags; + msg->rpl_send_flags = tmp.rpl_send_flags; msg->dst_uri = tmp.dst_uri; msg->path_vec = tmp.path_vec;

1 0

git:sr_3.0: seas: use set_force_socket()
by Andrei Pelinescu-Onciul 05 Nov '09

05 Nov '09

Module: sip-router Branch: sr_3.0 Commit: 710b07269cc63a7ddf7323d68bcb619bd4d63816 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=710b072… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 5 15:17:15 2009 +0100 seas: use set_force_socket() - use set_force_socket() instead of msg->force_send_socket --- modules_k/seas/seas_action.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules_k/seas/seas_action.c b/modules_k/seas/seas_action.c index 15e4030..2b7335a 100644 --- a/modules_k/seas/seas_action.c +++ b/modules_k/seas/seas_action.c @@ -817,7 +817,9 @@ int ac_sl_msg(as_p the_as,char *action,int len) }else{ uri = GET_RURI(my_msg); } - my_msg->force_send_socket=grep_sock_info(&my_msg->via1->host,my_msg->via1->port,my_msg->via1->proto); + set_force_socket(my_msg, grep_sock_info(&my_msg->via1->host, + my_msg->via1->port, + my_msg->via1->proto) ); /* or also could be: my_msg->force_send_socket=the_as->binds[processor_id].bind_address; not sure which is better...

1 0

git:sr_3.0: pv: use set_force_socket()
by Andrei Pelinescu-Onciul 05 Nov '09

05 Nov '09

Module: sip-router Branch: sr_3.0 Commit: d41be35145a2f049c574d183771ea7102563e8af URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d41be35… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 5 15:15:33 2009 +0100 pv: use set_force_socket() - use set_force_socket() instead of msg->force_send_socket --- modules_k/pv/pv_core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index 71186dd..16c1f70 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -1882,7 +1882,7 @@ int pv_set_force_sock(struct sip_msg* msg, pv_param_t *param, if(val==NULL || (val->flags&PV_VAL_NULL)) { - msg->force_send_socket = NULL; + reset_force_socket(msg); return 0; } @@ -1904,7 +1904,7 @@ int pv_set_force_sock(struct sip_msg* msg, pv_param_t *param, si = grep_sock_info(&host, (unsigned short)port, (unsigned short)proto); if (si!=NULL) { - msg->force_send_socket = si; + set_force_socket(msg, si); } else { LM_WARN("no socket found to match [%.*s]\n", val->rs.len, val->rs.s);

1 0

git:sr_3.0: registrar(k): use set_force_socket()
by Andrei Pelinescu-Onciul 05 Nov '09

05 Nov '09

Module: sip-router Branch: sr_3.0 Commit: f2ba4e06b008ac5fcc0c650761f2e7f980292a6e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2ba4e0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 5 15:16:05 2009 +0100 registrar(k): use set_force_socket() - use set_force_socket() instead of msg->force_send_socket --- modules_k/registrar/lookup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index 5a0f19e..2db8ee7 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -134,7 +134,7 @@ int lookup(struct sip_msg* _m, char* _t, char* _s) setbflagsval( 0, ptr->cflags); if (ptr->sock) - _m->force_send_socket = ptr->sock; + set_force_socket(_m, ptr->sock); ptr = ptr->next; }

1 0

git:sr_3.0: domainpolicy: use set_force_socket()
by Andrei Pelinescu-Onciul 05 Nov '09

05 Nov '09

Module: sip-router Branch: sr_3.0 Commit: 67b7508a1c8964abbf55f3f09363a45f8aa871f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67b7508… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 5 15:13:36 2009 +0100 domainpolicy: use set_force_socket() - use set_force_socket() instead of msg->force_send_socket --- modules_k/domainpolicy/domainpolicy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/domainpolicy/domainpolicy.c b/modules_k/domainpolicy/domainpolicy.c index ee8cc29..f77095e 100644 --- a/modules_k/domainpolicy/domainpolicy.c +++ b/modules_k/domainpolicy/domainpolicy.c @@ -850,7 +850,7 @@ int dp_apply_policy(struct sip_msg* _msg, char* _s1, char* _s2) { } si = grep_sock_info( &host, (unsigned short) port, (unsigned short) proto); if (si) { - _msg->force_send_socket = si; + set_force_socket(_msg, si); } else { LM_WARN("could not find socket for" "send_socket '%.*s'\n", val.s.len, ZSW(val.s.s));

1 0

git:sr_3.0: tmx: pv_t_copy_msg: copy also the send flags
by Andrei Pelinescu-Onciul 05 Nov '09

05 Nov '09

Module: sip-router Branch: sr_3.0 Commit: 2c3aaa7aad0907a23e7f5d5bb3e743d25f734faf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2c3aaa7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 5 15:19:29 2009 +0100 tmx: pv_t_copy_msg: copy also the send flags --- modules_k/tmx/t_var.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/tmx/t_var.c b/modules_k/tmx/t_var.c index e54e99f..6441763 100644 --- a/modules_k/tmx/t_var.c +++ b/modules_k/tmx/t_var.c @@ -52,6 +52,8 @@ int pv_t_copy_msg(struct sip_msg *src, struct sip_msg *dst) dst->set_global_address=src->set_global_address; dst->set_global_port=src->set_global_port; dst->flags = src->flags; + dst->fwd_send_flags = src->fwd_send_flags; + dst->rpl_send_flags = src->rpl_send_flags; dst->force_send_socket = src->force_send_socket; if (parse_msg(dst->buf, dst->len, dst)!=0)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2009