sr-dev November 2009

sr-dev@lists.kamailio.org

30 participants
177 discussions

git:kamailio_3.0: imc(k): : set callback type for local requests
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 9eb765ffc7f6e9eac99b7f998b37f56338d8c285 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9eb765f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 12:29:48 2009 +0100 imc(k): : set callback type for local requests - type has to be TMCB_LOCAL_COMPLETED to execute transaction callback --- modules_k/imc/imc_cmd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/imc/imc_cmd.c b/modules_k/imc/imc_cmd.c index 163f5f8..0bf8e50 100644 --- a/modules_k/imc/imc_cmd.c +++ b/modules_k/imc/imc_cmd.c @@ -491,7 +491,7 @@ int imc_handle_invite(struct sip_msg* msg, imc_cmd_t *cmd, cback_param->inv_uri = member->uri; /*?!?! possible race with 'remove user' */ - set_uac_req(&uac_r, &imc_msg_type, &all_hdrs, &body, 0, 0, + set_uac_req(&uac_r, &imc_msg_type, &all_hdrs, &body, 0, TMCB_LOCAL_COMPLETED, imc_inv_callback, (void*)(cback_param)); result= tmb.t_request(&uac_r, &member->uri, /* Request-URI */

1 0

git problem: "svn up" sr_3.0 branch
by Klaus Darilion 06 Nov '09

06 Nov '09

Hi! Once again I fail to use git - hope someone can help me. I just want to have a local copy of sr_3.0 branch for testing. So, first I cloned the repository: git clone git://git.sip-router.org/sip-router Then I made a local branch to follow the remote branch: git checkout --track -b sr_3.0 This worked fine, I built and installed sip-router. Now, as there were some commits today, I wanted to update my local branch. How? I tried a simple "git pull" but it always says: From . * branch master -> FETCH_HEAD Already up-to-date. ?????? Thanks klaus

2 3

SF.net SVN: openser:[5953] branches/1.5/modules/sl
by Marius Zbihlei 06 Nov '09

06 Nov '09

Revision: 5953 http://openser.svn.sourceforge.net/openser/?rev=5953&view=rev Author: mariuszbihlei Date: 2009-11-06 10:07:54 +0000 (Fri, 06 Nov 2009) Log Message: ----------- Updated documentation for sl module Modified Paths: -------------- branches/1.5/modules/sl/README branches/1.5/modules/sl/doc/sl_admin.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:kamailio_3.0: tcp: use the forced socket ip as source
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: cecadda371383083e083ecebaba4f2c456a09f4d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cecadda… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> 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). (cherry picked from commit 6fcba958595c5189c1b9d97c8fc4c9f434a3c7ad) --- 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

git:kamailio_3.0: core: added id to every field of gw table schema
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 977bb6a680286eeb1eaad4d0466fdb09f5778201 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=977bb6a… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 05:58:59 2009 +0200 core: added id to every field of gw table schema (cherry picked from commit a3a3ce31042a025fe93520350e53b049d5ef850d) --- 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

git:kamailio_3.0: textops(k): msg_apply_changes: preserve the send flags
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 88372eca71900d4f3d2c1d866a65fc513862bc45 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=88372ec… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 5 15:17:56 2009 +0100 textops(k): msg_apply_changes: preserve the send flags - restore also the msg send flags (cherry picked from commit 79ba45449704df8fd21740b216fed710e1bd5101) --- 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:kamailio_3.0: tmx: pv_t_copy_msg: copy also the send flags
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 3509dab67e4df6d737da4f1c48e2f7d0563b2d4c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3509dab… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 5 15:19:29 2009 +0100 tmx: pv_t_copy_msg: copy also the send flags (cherry picked from commit 2c3aaa7aad0907a23e7f5d5bb3e743d25f734faf) --- 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

git:kamailio_3.0: registrar(k): use set_force_socket()
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: f52ede274acf434b223919ef35c5e750f796ffa3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f52ede2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> 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 (cherry picked from commit f2ba4e06b008ac5fcc0c650761f2e7f980292a6e) --- 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:kamailio_3.0: seas: use set_force_socket()
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: a0015a9d79a78047ce808442ad3e800b7eca1f78 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0015a9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 5 15:17:15 2009 +0100 seas: use set_force_socket() - use set_force_socket() instead of msg->force_send_socket (cherry picked from commit 710b07269cc63a7ddf7323d68bcb619bd4d63816) --- 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:kamailio_3.0: rr(k): use set_force_socket()
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: a48787f281620e34b684dda1a19d7de49553d8ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a48787f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 5 15:16:44 2009 +0100 rr(k): use set_force_socket() - use set_force_socket() instead of msg->force_send_socket (cherry picked from commit bae241c28017b9a764876aee942065b941f28922) --- modules_k/rr/loose.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/rr/loose.c b/modules_k/rr/loose.c index ad85bf0..ab2f006 100644 --- a/modules_k/rr/loose.c +++ b/modules_k/rr/loose.c @@ -597,7 +597,7 @@ static inline int after_strict(struct sip_msg* _m) * send interface the one advertise in second Route */ si = grep_sock_info( &puri.host, puri.port_no, puri.proto); if (si) { - _m->force_send_socket = si; + set_force_socket(_m, si); } else { LM_WARN("no socket found for match second RR\n"); } @@ -813,7 +813,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } si = grep_sock_info( &puri.host, puri.port_no, puri.proto); if (si) { - _m->force_send_socket = si; + set_force_socket(_m, si); } else { LM_WARN("no socket found for match second RR\n"); }

1 0

← Newer
1
...
10
11
12
13
14
15
16
17
18
Older →

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