sr-dev April 2009

sr-dev@lists.kamailio.org

13 participants
230 discussions

git:master: libcds: added missing parse_to.h include

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 8203f7af56f4cfe10ee437c5ee5000776e4bd8d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8203f7a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 15 20:24:04 2009 +0200 libcds: added missing parse_to.h include --- lib/cds/sip_utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/cds/sip_utils.c b/lib/cds/sip_utils.c index eff7460..b7955a1 100644 --- a/lib/cds/sip_utils.c +++ b/lib/cds/sip_utils.c @@ -5,6 +5,7 @@ #include <parser/parse_expires.h> #include <parser/parse_subscription_state.h> #include <parser/parser_f.h> +#include <parser/parse_to.h> #include <trim.h>

15 years, 8 months

git:master: Merge kamailio modules into sip-router master branch

by Jan Janak

Module: sip-router Branch: master Commit: 03d35c2b93d58c0abb5fd4f47ea010148adb815d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03d35c2… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Apr 15 17:54:03 2009 +0200 Merge kamailio modules into sip-router master branch * commit 'origin/kamailio_modules': (3363 commits) Fix relative paths to tm header files. Removing kamailio tlsops module. Removing kamailio version of db_postgres module. Removing kamailio version of db_mysql module. Removing kamailio version of db_flatstore module. Removing kamailio db_berkeley module. Removing kamailio carrierroute module. Removing kamailio version of tm module Switch to sip-router calling convetion of t_request Define OPENSER_MOD_INTERFACE in Makefile. Define OPENSER_MOD_INTERFACE in Makefile. Various db api changes needed after migration to libsrdb1 Define OPENSER_MOD_INTERFACE in Makefile. Convert hostent2su into proxy2su Update the number of parameters to mk_shm_proxy to sr version Include lvalue.h which defines EQ_T in sip-router Update module to use libkmi Define OPENSER_MOD_INTERFACE in Makefile. Enclose a label in #ifdef STATISTICS to avoid compilation warning Update parse_phostport parameters to the sr version of the function ... ---

15 years, 8 months

git:kamailio_modules: Fix relative paths to tm header files.

by Jan Janak

Module: sip-router Branch: kamailio_modules Commit: eb38b3df06a26dda770d60431edd836e1c7e1b6e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb38b3d… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Apr 15 17:09:42 2009 +0200 Fix relative paths to tm header files. This patch fixes relative paths to header files included from the tm module. The module is located in sip-router/modules which kamailio modules are in sip-router/modules_k, thus we have to replace ../tm/ with ../../modules/tm/. --- modules_k/acc/acc.c | 2 +- modules_k/acc/acc_logic.c | 2 +- modules_k/acc/acc_logic.h | 2 +- modules_k/acc/acc_mod.c | 2 +- modules_k/cpl-c/cpl_env.h | 2 +- modules_k/cpl-c/cpl_proxy.h | 2 +- modules_k/cpl-c/cpl_run.c | 2 +- modules_k/cpl-c/cpl_sig.c | 2 +- modules_k/dialog/dialog.c | 2 +- modules_k/dialog/dlg_handlers.c | 2 +- modules_k/dialog/dlg_handlers.h | 2 +- modules_k/dialog/dlg_profile.c | 2 +- modules_k/dialog/dlg_req_within.c | 4 ++-- modules_k/dialog/dlg_transfer.c | 2 +- modules_k/dispatcher/dispatch.c | 2 +- modules_k/dispatcher/dispatch.h | 2 +- modules_k/imc/imc.c | 2 +- modules_k/imc/imc.h | 2 +- modules_k/jabber/jabber.c | 2 +- modules_k/jabber/xjab_worker.c | 2 +- modules_k/jabber/xjab_worker.h | 2 +- modules_k/lcr/lcr_mod.c | 2 +- modules_k/msilo/msilo.c | 2 +- modules_k/nat_traversal/nat_traversal.c | 2 +- modules_k/osp/tm.c | 2 +- modules_k/presence/notify.c | 2 +- modules_k/presence/notify.h | 2 +- modules_k/presence/presence.c | 2 +- modules_k/presence/presence.h | 2 +- modules_k/pua/pua.c | 2 +- modules_k/pua/send_publish.c | 2 +- modules_k/pua/send_publish.h | 2 +- modules_k/pua/send_subscribe.c | 4 ++-- modules_k/pua/send_subscribe.h | 2 +- modules_k/pua_dialoginfo/dialog_publish.c | 2 +- modules_k/pua_mi/pua_mi.c | 2 +- modules_k/pua_usrloc/ul_publish.c | 2 +- modules_k/pua_xmpp/pua_xmpp.c | 2 +- modules_k/purple/purple.c | 2 +- modules_k/purple/purple_sip.c | 2 +- modules_k/rls/notify.c | 2 +- modules_k/rls/rls.c | 2 +- modules_k/seas/seas.c | 6 +++--- modules_k/seas/seas.h | 2 +- modules_k/seas/seas_action.c | 6 +++--- modules_k/seas/statistics.h | 2 +- modules_k/siptrace/siptrace.c | 2 +- modules_k/sl/sl.c | 2 +- modules_k/sms/sms.c | 2 +- modules_k/sms/sms_funcs.c | 4 ++-- modules_k/sms/sms_funcs.h | 2 +- modules_k/uac/auth.c | 2 +- modules_k/uac/from.c | 4 ++-- modules_k/uac/from.h | 2 +- modules_k/uac/uac.c | 4 ++-- modules_k/uac/uac_send.c | 2 +- modules_k/uac_redirect/rd_funcs.h | 2 +- modules_k/uac_redirect/redirect.c | 2 +- modules_k/xmpp/xmpp.c | 2 +- 59 files changed, 68 insertions(+), 68 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=eb3…

15 years, 8 months

git:janakj/kcore DELETED: Make the parser work with the sr core

by Jan Janak

Module: sip-router Branch: janakj/kcore DELETED Commit: 0f17a8a5a322bc75fdd5e2fb158b33dd059b25d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f17a8a… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 29 22:01:50 2009 +0200 Make the parser work with the sr core List of changes: * Fix header paths * Include defines that are missing from keys.h * Replace hf->sibling with next_sibling_hdr --- lib/kcore/parse_supported.c | 9 ++++++--- lib/kcore/parse_supported.h | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/kcore/parse_supported.c b/lib/kcore/parse_supported.c index ddecf50..e655d30 100644 --- a/lib/kcore/parse_supported.c +++ b/lib/kcore/parse_supported.c @@ -26,10 +26,13 @@ * \ingroup parser */ -#include "../mem/mem.h" -#include "keys.h" +#include "../../mem/mem.h" +#include "../../parser/keys.h" #include "parse_supported.h" +#define _100r_ 0x72303031 /* "100r" for "100rel" */ +#define _time_ 0x656d6974 /*!< "time" */ + #define IS_DELIM(c) (*(c) == ' ' || *(c) == '\t' || *(c) == '\r' || *(c) == '\n' || *(c) == ',') /* from parser/parse_hname2.c: */ @@ -119,7 +122,7 @@ int parse_supported( struct sip_msg *msg) /* bad luck! :-( - we have to parse them */ supported = 0; - for( hdr=msg->supported ; hdr ; hdr=hdr->sibling) { + for( hdr=msg->supported ; hdr ; hdr=next_sibling_hdr(hdr)) { if (hdr->parsed) { supported |= ((struct supported_body*)hdr->parsed)->supported; continue; diff --git a/lib/kcore/parse_supported.h b/lib/kcore/parse_supported.h index 9a177fd..c618b8d 100644 --- a/lib/kcore/parse_supported.h +++ b/lib/kcore/parse_supported.h @@ -35,8 +35,8 @@ #ifndef PARSE_SUPPORTED_H #define PARSE_SUPPORTED_H -#include "msg_parser.h" -#include "../mem/mem.h" +#include "../../parser/msg_parser.h" +#include "../../mem/mem.h" #define F_SUPPORTED_PATH (1 << 0)

15 years, 8 months

git:master: Merge commit 'origin/janakj/kcore'

by Jan Janak

Module: sip-router Branch: master Commit: 93c2f8aedc4b9fa97af3eb1caa77215a4cbb049e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=93c2f8a… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Apr 15 13:35:47 2009 +0200 Merge commit 'origin/janakj/kcore' * commit 'origin/janakj/kcore': (32 commits) Make the parser work with the sr core Update header field paths, we moved the parser to libkcore Adding the supported parser from kamailio core Adding the sst parser from kamailio core Function to retrieve the first URI from Path headers. Moving socket related code from snmpstats module into libkcore Added privacy header parser from kamailio to kcore lib Use next_sibling_hdr to obtain next header with same type Kamailio compatiblity: export last_retcode via a global variable Fix paths to header files in the sr core. Adding files regexp.[ch] from kamailio core Fix path to msg_parser.h Fixing the path to headers in the sip-router core. Adding P-Preferred-Identity header parser from kamailio core Fix paths to headers in the sip-router core. P-Asserted-Identity parser from kamailio core Update header paths Adding core_stats.[ch] from kamailio Copy statistics files from kamailio into libkcore Adding faked_msg.[ch] from kamailio core ... ---

15 years, 8 months

Patch: fix nathelper module loading

by Henning Westerholt

Hi, this patch fixes the module loading for the nathelper module. The module registers the additional processes only (for ping timers) only when natping_interval > 0. Thus we need to check for this variable in the child_init(..) function as well. Cheers, Henning diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c index e9666bf..4118bf2 100644 --- a/modules/nathelper/nathelper.c +++ b/modules/nathelper/nathelper.c @@ -1166,7 +1166,7 @@ child_init(int rank) struct rtpp_set *rtpp_list; struct rtpp_node *pnode; - if (rank==PROC_MAIN) { + if (rank==PROC_MAIN && natping_interval > 0) { for( i=0 ; i<natping_processes ; i++ ) { if(fork_dummy_timer(PROC_TIMER, "TIMER NH", 1 /*socks flag*/, nh_timer, (void*)(unsigned long)i,

15 years, 8 months

Module migration to git starts now

by Jan Janak

Folks, I am about to start migrating SER modules and Kamailio modules to the git repository at git://git.sip-router.org/sip-router. I suppose it will take most of the day, I will send another announcement when it is done. Unless you have something very urgent to commit, please wait with commits to the svn trunk and cvs head. This applies only to cvs head and svn trunk, feel free to commit to other branches. If you have something that you need to commit urgently to svn trunk or cvs head, please do so and let me know by email. Thanks for your cooperation. Jan.

15 years, 8 months

path parser support in sr

by Henning Westerholt

Hi, one module that is still not works with sr is the registrar module. In order to compile path support (RFC 3327) is necessary. The path module already compiles, but some necessary functions in the parser are missing. I've digged a bit in the archives, a few years ago there were some proposals about path support in SER, but i was not able to found this in the current tree. I found something in the roadmap for SER 2.1. How should i progress in this regards? Just try to porting the missing parser parts from kamailio, or is there perhaps a own implementation in SER somehow? Henning

15 years, 8 months

Migration to Git

by Jan Janak

Folks, Most of you probably know that we have been working on integration of SER and Kamailio projects. We aim at having one common source tree long term, hoping that this would allow us share share the workload. The integration work has been going on in git repositories at http://git.sip-router.org and on the sr-dev (http://lists.sip-router.org) mailing list. As of today we have a common core that contains most features available in both projects, we can compile all SER modules with the new core and most Kamailio modules. Tomorrow we will migrate both projects to the shared git repository and further development will continue there. The URL of the shared repository will be git://git.sip-router.org/sip-router for read-only access and ssh://<username>@git.sip-router.org/sip-router for read write access. The repository is also available via HTTP(S) for read-only access. You can also browse the contents of the repository through the WWW interface at http://git.sip-router.org Repository Layout ----------------- The most important branch in the repository is the branch named 'master'. This is the equivalent of CVS HEAD and SVN trunk branches. The most up-to-date code can be found there. This is the branch you need to look at if you want to get a glimpse of the most recent code. You will also see a number of personal branches of individual developers, these branches typically contain work in progress and haven't been merged into the master branch yet. The biggest difference in the repository layout is that there will be three directories containing modules. The subdirectory 'modules' will contain modules that are shared between SER and Kamailio. Initially, this directory will contain modules that only exist in one of the projects (i.e. there is no module with conflicting name in the other project), or modules that have already been merged and provide functionality needed by both project. That includes modules like carrierroute, tls, tm, db_mysql, db_flatstore, db_berkeley, db_mysql, and so on. Directory modules_s will contain original SER modules from the CVS repository, updated to make tham work with the sip-router core. Directory modules_k will contain original Kamailio modules from the SVN repository, modules in this directory will be updated with patches that we have been keeping in kamailio-3.0 temporary repository now. This temporary repository will be deleted after the migration. Write Access ------------ All developers in the table below have write access to branch master. In addition to that developers have write access to their personal branches. Personal branches are the branches that start with the username of the developer followed by a slash and the name of the branch, for example janakj/kcore. Only user with username janakj has write access to that branch. Write access to other branches is not permitted by default. This is to make sure that people do not modify the work in progress of other developers by mistake. I often create a number of topic branches in my local repository and synchronize them with the master repository at git.sip-router.org. The write restriction makes me to put all such branches under janakj/, this make it clear who owns them. You are free to create as many topic branches as you wish. Branches are cheap and it is the preferred way of doing non-trivial changes. All developers will have write access to newly created release branches, of course. Here is a list of people who currently have write access to the git repository: Name | Username | Commitlog Email -------------------------+------------+---------------------------- Jan Janak | janakj | jan(a)iptel.org Martin Hoffmann | martinh | hn(a)nvnc.de Andrei Pelinescu-Onciul | andrei | andrei(a)iptel.org Pavel Kasparek | pavel | pavel(a)iptel.org Greger V. Teigre | greger | greger(a)teigre.com Alfred E. Heggestad | alfredh | aeh(a)db.org Gonzalo Javier Sambucaro | sambucaro | gonzalo(a)mslc.com.ar Ondrej Martinek | ondra | ondra(a)iptel.org Bogdan Pintea | bpintea | bogdan(a)iptego.com Libor Chocholaty | liborc | libor(a)iptel.org Vladimir Marek | vlada | vlada(a)iptel.org Di-Shi Sun | di-shi | di-shi(a)transnexus.com Hendrik Scholz | hscholz | hscholz(a)raisdorf.net Raphael Coeffic | rco | rco(a)iptel.org Maxim Sobolev | sobomax | sobomax(a)sippysoft.com Jiri Kuthan | jiri | jiri(a)iptel.org Miklos Tirpak | tirpi | miklos(a)iptel.org Michal Matyska | mma | michal.matyska(a)iptel.org Nils Ohlmeier | calrissian | nils(a)iptel.org Karel Kozlik | kozlik | karel(a)iptel.org Dmitry Semyonov | dsemyonov | dsemyonov(a)dins.ru Vaclav Kubart | kubartv | vaclav.kubart(a)iptel.org Tomas Mandys | tma0 | tomas.mandys(a)iptel.org Dmitry Isakbayev | isakdim | isakdim(a)gmail.com Daniel-Constantin Mierla | daniel | miconda(a)gmail.com Henning Westerholt | henning | henning.westerholt(a)1und1.de -------------------------+------------+---------------------------- If you had write access to either SER or Kamailio repository and you are not on the list then, please, send us your public ssh key and desired username and we will give you write access. You can send the key to jan(a)iptel.org, andrei(a)iptel.org, or miconda(a)gmail.com. To try whether your write access works, you can clone the repository over ssh: $ git clone ssh://<username>@git.sip-router.org/sip-router If it worked then your ssh key is installed and you should be able to modify the repository. Jan.

15 years, 8 months

Patch: pdb loading fix

by Henning Westerholt

against kamailio-3.0, include libkmi library to enable to load the pdt module diff --git a/modules/pdt/Makefile b/modules/pdt/Makefile index 4756d05..9bc93c8 100644 --- a/modules/pdt/Makefile +++ b/modules/pdt/Makefile @@ -14,4 +14,5 @@ DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 +SER_LIBS+=$(SERLIBPATH)/kmi/kmi include ../../Makefile.modules

15 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2009