sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
439 discussions

git:master: dispatcher(k): use the right pointer to rpc context
by Elena-Ramona Modroiu 08 Dec '12

08 Dec '12

Module: sip-router Branch: master Commit: 6904d8c80b2089d01a69c3c0217c76c8e0132bac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6904d8c… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Sat Dec 8 14:19:30 2012 +0100 dispatcher(k): use the right pointer to rpc context --- modules_k/dispatcher/dispatcher.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index 4757c64..cf79d90 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -978,14 +978,14 @@ static void dispatcher_rpc_list(rpc_t* rpc, void* ctx) /* add entry node */ if (rpc->add(ctx, "{", &th) < 0) { - rpc->fault(c, 500, "Internal error root reply"); + rpc->fault(ctx, 500, "Internal error root reply"); return; } if(rpc->struct_add(th, "d{", "SET_NO", ds_list_nr, "SET", &ih)<0) { - rpc->fault(c, 500, "Internal error set structure"); + rpc->fault(ctx, 500, "Internal error set structure"); return; } @@ -995,7 +995,7 @@ static void dispatcher_rpc_list(rpc_t* rpc, void* ctx) if(rpc->struct_add(ih, "d", "SET_ID", list->id)<0) { - rpc->fault(c, 500, "Internal error creating set id"); + rpc->fault(ctx, 500, "Internal error creating set id"); return; } @@ -1004,7 +1004,7 @@ static void dispatcher_rpc_list(rpc_t* rpc, void* ctx) if(rpc->struct_add(ih, "{", "DEST", &vh)<0) { - rpc->fault(c, 500, "Internal error creating dest"); + rpc->fault(ctx, 500, "Internal error creating dest"); return; } @@ -1030,7 +1030,7 @@ static void dispatcher_rpc_list(rpc_t* rpc, void* ctx) "ATTRS", (list->dlist[j].attrs.body.s)? &(list->dlist[j].attrs.body):&data)<0) { - rpc->fault(c, 500, "Internal error creating dest struct"); + rpc->fault(ctx, 500, "Internal error creating dest struct"); return; } }

1 0

git:master: ratelimit: Typo fixes, minor edits
by Olle E. Johansson 08 Dec '12

08 Dec '12

Module: sip-router Branch: master Commit: ad5cbdc7aa6156e072f0dd859421fc36b66227c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad5cbdc… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Dec 8 18:19:43 2012 +0100 ratelimit: Typo fixes, minor edits --- modules/ratelimit/README | 234 ++++++++++++++--------------- modules/ratelimit/doc/ratelimit_admin.xml | 64 ++++---- 2 files changed, 147 insertions(+), 151 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ad5…

1 0

git:master: core and several modules: instance and reg_id in branch_t
by admin＠sip-router.org 08 Dec '12

08 Dec '12

Module: sip-router Branch: master Commit: 571e4e3fceeff5b4d32d1ac34649e9c4031d6543 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=571e4e3… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Dec 8 14:17:46 2012 +0200 core and several modules: instance and reg_id in branch_t - added instance and reg_id fields to branch_t - added instance and reg_id arguments to append_branch function - modified append_branch calls in core and several modules - did not touch obsolete or modules_s modules (which are to be removed from next release) --- action.c | 5 ++- config.h | 6 +++- dset.c | 31 +++++++++++++++++++++++++---- dset.h | 43 +++++++++++++++++++++++------------------ modules/avpops/avpops_impl.c | 5 ++- modules/corex/corex_lib.c | 4 +- modules/dialplan/dialplan.c | 2 +- modules/enum/enum.c | 5 ++- modules/tm/t_serial.c | 2 +- modules_k/alias_db/alookup.c | 3 +- modules_k/cpl-c/cpl_sig.c | 8 ++++-- modules_k/exec/exec.c | 3 +- 12 files changed, 76 insertions(+), 41 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=571…

3 6

git:master: modules_s: migrated append_branch in cpl-c, exec, and registrar modules
by admin＠sip-router.org 08 Dec '12

08 Dec '12

Module: sip-router Branch: master Commit: 181561c7dc50c0c4e6ac84b53b33d8a5bc6dd053 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=181561c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Dec 8 16:09:40 2012 +0200 modules_s: migrated append_branch in cpl-c, exec, and registrar modules --- modules_s/cpl-c/cpl_sig.c | 2 +- modules_s/registrar/lookup.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/modules_s/cpl-c/cpl_sig.c b/modules_s/cpl-c/cpl_sig.c index 00b0a32..9b5fe50 100644 --- a/modules_s/cpl-c/cpl_sig.c +++ b/modules_s/cpl-c/cpl_sig.c @@ -84,7 +84,7 @@ int cpl_proxy_to_loc_set( struct sip_msg *msg, struct location **locs, DBG("DEBUG:cpl_c:cpl_proxy_to_loc_set: appending branch " "<%.*s>\n",(*locs)->addr.uri.len,(*locs)->addr.uri.s); if(append_branch(msg, &(*locs)->addr.uri, - 0, 0, Q_UNSPECIFIED, 0, 0)==-1){ + 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0)==-1){ LOG(L_ERR,"ERROR:cpl_c:cpl_proxy_to_loc_set: failed when " "appending branch <%s>\n",(*locs)->addr.uri.s); goto error; diff --git a/modules_s/registrar/lookup.c b/modules_s/registrar/lookup.c index 61e97fa..18b2ecc 100644 --- a/modules_s/registrar/lookup.c +++ b/modules_s/registrar/lookup.c @@ -165,7 +165,8 @@ skip_rewrite_uri: LOG(L_ERR, "ERROR: lookup(): branch: out of memory\n"); goto cont; /* try to continue */ } - if (append_branch(_m, &new_uri, 0, 0, ptr->q, 0, 0) == -1) { + if (append_branch(_m, &new_uri, 0, 0, ptr->q, + 0, 0, 0, 0) == -1) { LOG(L_ERR, "lookup(): Error while appending a branch\n"); pkg_free(new_uri.s); if (ser_error==E_TOO_MANY_BRANCHES) goto skip; @@ -174,8 +175,10 @@ skip_rewrite_uri: } pkg_free(new_uri.s); /* append_branch doesn't free it */ }else{ - if (append_branch(_m, &ptr->c, &ptr->received, 0 /* path */, - ptr->q, 0 /* brflags*/, ptr->sock) == -1) { + if (append_branch(_m, &ptr->c, &ptr->received, + 0 /* path */, + ptr->q, 0 /* brflags*/, + ptr->sock, 0, 0) == -1) { LOG(L_ERR, "lookup(): Error while appending a branch\n"); goto skip; /* Return OK here so the function succeeds */ } @@ -326,7 +329,8 @@ skip_rewrite_uri: ERR("branch: out of memory\n"); goto cont; /* try to continue */ } - if (append_branch(msg, &new_uri, 0, 0, ptr->q, 0, 0) == -1) { + if (append_branch(msg, &new_uri, 0, 0, ptr->q, + 0, 0, 0, 0) == -1) { ERR("Error while appending a branch\n"); pkg_free(new_uri.s); if (ser_error == E_TOO_MANY_BRANCHES) goto skip; @@ -335,8 +339,10 @@ skip_rewrite_uri: } pkg_free(new_uri.s); /* append_branch doesn't free it */ } else { - if (append_branch(msg, &ptr->c, &ptr->received, 0 /* path */, - ptr->q, 0, ptr->sock) == -1) { + if (append_branch(msg, &ptr->c, &ptr->received, + 0 /* path */, + ptr->q, 0, ptr->sock, + 0, 0) == -1) { ERR("Error while appending a branch\n"); goto skip; /* Return OK here so the function succeeds */ }

1 0

git:master: modules_k/pv: fixed compilation error in define
by admin＠sip-router.org 08 Dec '12

08 Dec '12

Module: sip-router Branch: master Commit: e8210c30ef79a5a6f6fa88a2cb47bf29ca50bfe0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8210c3… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Dec 8 16:00:34 2012 +0200 modules_k/pv: fixed compilation error in define - removed extra ';' from km_append_branch define - thanks to Daniel-Constantin Mierla for reporting --- dset.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dset.h b/dset.h index b825df7..bc131ef 100644 --- a/dset.h +++ b/dset.h @@ -92,7 +92,7 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, /*! \brief kamailio compatible version */ #define km_append_branch(msg, uri, dst_uri, path, q, flags, force_socket) \ - append_branch(msg, uri, dst_uri, path, q, flags, force_socket, 0, 0); + append_branch(msg, uri, dst_uri, path, q, flags, force_socket, 0, 0) /*! \brief ser compatible append_branch version. * append_branch version compatible with ser: no path or branch flags support

1 0

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Olle E. Johansson 08 Dec '12

08 Dec '12

Module: sip-router Branch: master Commit: 440bcec4b5694ac79cd8dfb134defd472e96c60e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=440bcec… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Dec 8 14:12:15 2012 +0100 Merge branch 'master' of ssh://git.sip-router.org/sip-router Sorry, still can't fix this. Working on it. :-) * 'master' of ssh://git.sip-router.org/sip-router: core: restored USER_AGENT and SERVER_HDR defines ---

1 0

git:master: nathelper: add force_socket documentation ( moved from rtpproxy module)
by Olle E. Johansson 08 Dec '12

08 Dec '12

Module: sip-router Branch: master Commit: 1cfa90d171a72ad5e2b224ae0d6f2eb92d3eeb55 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1cfa90d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Dec 8 14:10:48 2012 +0100 nathelper: add force_socket documentation (moved from rtpproxy module) The rtpproxy module did not have a force_socket parameter, but nathelper did. --- modules/rtpproxy/README | 269 +++++++++++++-------------- modules/rtpproxy/doc/rtpproxy_admin.xml | 98 ++++------ modules_k/nathelper/README | 188 ++++++++++--------- modules_k/nathelper/doc/nathelper_admin.xml | 20 ++ 4 files changed, 297 insertions(+), 278 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1cf…

1 0

git:master: core: restored USER_AGENT and SERVER_HDR defines
by admin＠sip-router.org 08 Dec '12

08 Dec '12

Module: sip-router Branch: master Commit: ca7b18825ed478b2d23a092f681939a233183003 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca7b188… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Dec 8 14:44:38 2012 +0200 core: restored USER_AGENT and SERVER_HDR defines - they were changed by accident by previous commit --- config.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.h b/config.h index dddbab3..6329f7b 100644 --- a/config.h +++ b/config.h @@ -87,11 +87,11 @@ #define CONTENT_LENGTH "Content-Length: " #define CONTENT_LENGTH_LEN (sizeof(CONTENT_LENGTH)-1) -#define USER_AGENT "User-Agent: OpenXg SIP Proxy "\ +#define USER_AGENT "User-Agent: " NAME \ " (" VERSION " (" ARCH "/" OS_QUOTED "))" #define USER_AGENT_LEN (sizeof(USER_AGENT)-1) -#define SERVER_HDR "Server: OpenXg SIP Proxy "\ +#define SERVER_HDR "Server: " NAME \ " (" VERSION " (" ARCH "/" OS_QUOTED "))" #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1)

1 0

Status of outbound support
by Olle E. Johansson 08 Dec '12

08 Dec '12

Peter, What's the current status of the outbound support? Which branch is it? Can we do anything to help to get this into the coming release? /O

5 30

RTPproxy docs - force socket
by Olle E. Johansson 08 Dec '12

08 Dec '12

http://kamailio.org/docs/modules/3.3.x/modules/rtpproxy.html#id2531640 The modparam force_socket that is in the documentation for 3.3.x doesn't seem to exist in the source code any longer. The source says: "* 2004-10-10 force_socket option introduced (jiri)" That's all I find about it - no comment about it being removed. The same comment exists in modules_k/nathelper.c where the function exists. Seems like the rtpproxy module has a shared history with nathalper :-) I think it's safe to remove force_socket from the rtpproxy documentation. Anyone against? /O

3 5

← Newer
1
...
31
32
33
34
35
36
37
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2012