sr-dev October 2011

sr-dev@lists.kamailio.org

37 participants
283 discussions

git:master: snmpstats: control exporting registrar records
by Daniel-Constantin Mierla 29 Nov '11

29 Nov '11

Module: sip-router Branch: master Commit: 0696af54dac4ecc53bb0a9dc4e56da11bc3f2b30 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0696af5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Oct 16 11:33:16 2011 +0200 snmpstats: control exporting registrar records - exporting of large location database may result in out of shared memory, as well as when the records are not pulled - might be the case of out of memory messages reported by Klaus Darilion - new parameter export_registrar was added to enable/disable location records export (off by default) - fixed missing exporting the counter with all processed dialogs (discussion from March 2011 with Stefan Tiedje) --- modules_k/snmpstats/README | 31 ++++++++++++++++----- modules_k/snmpstats/doc/snmpstats_admin.xml | 25 +++++++++++++++++ modules_k/snmpstats/mibs/OPENSER-MIB | 13 ++++++++- modules_k/snmpstats/snmpObjects.c | 28 +++++++++++++++++++ modules_k/snmpstats/snmpObjects.h | 1 + modules_k/snmpstats/snmpstats.c | 40 +++++++++++++++++---------- 6 files changed, 115 insertions(+), 23 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=069…

2 6

git:misi/ua-profile: parser: added ua-profile event type
by Mihaly Meszaros 17 Nov '11

17 Nov '11

Module: sip-router Branch: misi/ua-profile Commit: 081ed6600b3af2ae491aa9de50e83724f6be07e3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=081ed66… Author: Mihály Mészáros <misi(a)niif.hu> Committer: Mihály Mészáros <misi(a)niif.hu> Date: Thu Oct 20 17:47:50 2011 +0200 parser: added ua-profile event type --- parser/parse_event.c | 1 + parser/parse_event.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/parser/parse_event.c b/parser/parse_event.c index 4211da2..8d30d71 100644 --- a/parser/parse_event.c +++ b/parser/parse_event.c @@ -56,6 +56,7 @@ static struct { {STR_STATIC_INIT("sip-profile"), EVENT_SIP_PROFILE}, {STR_STATIC_INIT("message-summary"), EVENT_MESSAGE_SUMMARY}, {STR_STATIC_INIT("dialog"), EVENT_DIALOG}, + {STR_STATIC_INIT("ua-profile"), EVENT_UA_PROFILE}, /* The following must be the last element in the array */ {STR_NULL, EVENT_OTHER} }; diff --git a/parser/parse_event.h b/parser/parse_event.h index ab51b79..1f23728 100644 --- a/parser/parse_event.h +++ b/parser/parse_event.h @@ -43,7 +43,8 @@ enum event_type { EVENT_SIP_PROFILE, EVENT_XCAP_CHANGE, EVENT_DIALOG, - EVENT_MESSAGE_SUMMARY + EVENT_MESSAGE_SUMMARY, + EVENT_UA_PROFILE };

3 5

Re: [sr-dev] git:master: core: new command line option -I
by Henning Westerholt 16 Nov '11

16 Nov '11

On Thursday 27 October 2011, Daniel-Constantin Mierla wrote: > Module: sip-router > Branch: master > Commit: f5803916a37e0f2151335e65283060c6a88de9e0 > URL: > http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f58039 > 16a37e0f2151335e65283060c6a88de9e0 > > core: new command line option -I > > - print details about default internal attributes Hi Daniel, have you thought about just extending the existing '-V' parameter? You print some more informations with the new added parameter, but its a bit redundant, IMHO. Or maybe remove the "non-version" information from the '-V' parameter? $ ./kamailio -V version: kamailio 3.3.0-dev1 (i386/linux) 0b8f2e 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: 0b8f2e compiled on 10:30:32 Oct 28 2011 with gcc 4.4.5 $ ./kamailio -I Print out of kamailio internals Version: kamailio 3.3.0-dev1 (i386/linux) 0b8f2e Default config: /usr/local/etc/kamailio/kamailio.cfg Default paths to modules: /usr/local/lib/kamailio/modules:/usr/local/lib/kamailio/modules_s:/usr/local/lib/kamailio/modules_k Compile 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 MAX_RECV_BUFFER_SIZE=262144 MAX_LISTEN=16 MAX_URI_SIZE=1024 BUF_SIZE=65535 DEFAULT PKG_SIZE=4MB DEFAULT SHM_SIZE=32MB ADAPTIVE_WAIT_LOOPS=1024 TCP poll methods: poll, epoll_lt, epoll_et, sigio_rt, select Source code revision ID: 0b8f2e Compiled with: gcc 4.4.5 Compiled on: 10:30:32 Oct 28 2011 Thank you for flying kamailio! Best regards, Henning

4 3

git:misi/ua-profile: modules_k/presence_profile: new modul for basic ua-profile event support
by Mihaly Meszaros 14 Nov '11

14 Nov '11

Module: sip-router Branch: misi/ua-profile Commit: d3a2b22db7e8c7c77f8bdf8af25ff23fe1316076 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d3a2b22… Author: Mihály Mészáros <misi(a)niif.hu> Committer: Mihály Mészáros <misi(a)niif.hu> Date: Thu Oct 20 17:49:51 2011 +0200 modules_k/presence_profile: new modul for basic ua-profile event support - This is a new modul that is using sip event framework for endpoint config provisioining. Currently it has very basic functionality. --- Makefile | 4 +- modules_k/presence/event_list.c | 2 +- modules_k/presence_profile/Makefile | 11 ++ modules_k/presence_profile/README | 77 +++++++++++++ modules_k/presence_profile/add_events.c | 66 +++++++++++ modules_k/presence_profile/add_events.h | 40 +++++++ modules_k/presence_profile/doc/Makefile | 4 + .../presence_profile/doc/presence_profile.xml | 39 +++++++ .../doc/presence_profile_admin.xml | 72 ++++++++++++ modules_k/presence_profile/presence_profile.c | 118 ++++++++++++++++++++ modules_k/presence_profile/presence_profile.h | 38 +++++++ 11 files changed, 468 insertions(+), 3 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d3a…

3 3

IMS Module included in next release ?
by alexis.marcou＠orange.com 08 Nov '11

08 Nov '11

Hi all, I see in the wiki, IMS Module are included in developpement version ? But, i couldn't find it, in GIT master branch ? I know, we can find IMS Module in carstenbock/ims branch, but, we have an error during the build. Alexis ******************************************************************************** IMPORTANT.Les informations contenues dans ce message electronique y compris les fichiers attaches sont strictement confidentielles et peuvent etre protegees par la loi. Ce message electronique est destine exclusivement au(x) destinataire(s) mentionne(s) ci-dessus. Si vous avez recu ce message par erreur ou s il ne vous est pas destine, veuillez immediatement le signaler a l expediteur et effacer ce message et tous les fichiers eventuellement attaches. Toute lecture, exploitation ou transmission des informations contenues dans ce message est interdite. Tout message electronique est susceptible d alteration. A ce titre, le Groupe France Telecom decline toute responsabilite notamment s il a ete altere, deforme ou falsifie. De meme, il appartient au destinataire de s assurer de l absence de tout virus. IMPORTANT.This e-mail message and any attachments are strictly confidential and may be protected by law. This message is intended only for the named recipient(s) above. If you have received this message in error, or are not the named recipient(s), please immediately notify the sender and delete this e-mail message. Any unauthorized view, usage or disclosure ofthis message is prohibited. Since e-mail messages may not be reliable, France Telecom Group shall not be liable for any message if modified, changed or falsified. Additionally the recipient should ensure they are actually virus free. ********************************************************************************

4 17

git:master: dialog(k): postpone setting tm callbacks until T is created
by Daniel-Constantin Mierla 03 Nov '11

03 Nov '11

Module: sip-router Branch: master Commit: ad4cfe8a3410059bc5c0b4951e49a952c4b01dfe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad4cfe8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 27 07:17:52 2011 +0200 dialog(k): postpone setting tm callbacks until T is created - add dialog in tm callbacks when transaction is created - when using dlg_manage(), if dialog does not makes it to transaction, clean it up - fixes case when stateless reply is used after dlg_manage() to create a new dialog --- modules_k/dialog/dialog.c | 3 +- modules_k/dialog/dlg_handlers.c | 95 ++++++++++++++++++++++++++------------- modules_k/dialog/dlg_hash.h | 2 + modules_k/dialog/dlg_profile.c | 7 +++- 4 files changed, 73 insertions(+), 34 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 7d8f239..14e8d81 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -507,7 +507,8 @@ static int mod_init(void) } if (initial_cbs_inscript != 0 && initial_cbs_inscript != 1) { - LM_ERR("invalid parameter for running initial callbacks in-script (must be either 0 or 1)\n"); + LM_ERR("invalid parameter for running initial callbacks in-script" + " (must be either 0 or 1)\n"); return -1; } diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index ccc95f1..701d80c 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -106,6 +106,8 @@ static unsigned int CURR_DLG_ID = 0xffffffff; /*!< current dialog id */ /*! separator inside the record-route paramter */ #define DLG_SEPARATOR '.' +int dlg_set_tm_callbacks(tm_cell_t *t, sip_msg_t *req, dlg_cell_t *dlg, + int mode); /*! * \brief Initialize the dialog handlers @@ -609,19 +611,28 @@ static inline int pre_match_parse( struct sip_msg *req, str *callid, */ void dlg_onreq(struct cell* t, int type, struct tmcb_params *param) { - struct sip_msg *req = param->req; + sip_msg_t *req = param->req; - if (!initial_cbs_inscript) { - if (spiral_detected == 1) - run_dlg_callbacks( DLGCB_SPIRALED, current_dlg_pointer, req, NULL, DLG_DIR_DOWNSTREAM, 0); - else if (spiral_detected == 0) - run_create_callbacks( current_dlg_pointer, req); - } - if((req->flags&dlg_flag)!=dlg_flag) - return; - if (current_dlg_pointer!=NULL) + if(req->first_line.u.request.method_value != METHOD_INVITE) return; - dlg_new_dialog(req, t, 1); + + if (current_dlg_pointer!=NULL) { + if (!initial_cbs_inscript) { + if (spiral_detected == 1) + run_dlg_callbacks( DLGCB_SPIRALED, current_dlg_pointer, + req, NULL, DLG_DIR_DOWNSTREAM, 0); + else if (spiral_detected == 0) + run_create_callbacks( current_dlg_pointer, req); + } + } + if (current_dlg_pointer==NULL) { + if((req->flags&dlg_flag)!=dlg_flag) + return; + dlg_new_dialog(req, t, 1); + } + if (current_dlg_pointer!=NULL) { + dlg_set_tm_callbacks(t, req, current_dlg_pointer, spiral_detected); + } } @@ -782,9 +793,10 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cb spiral_detected = 1; if (run_initial_cbs) - run_dlg_callbacks( DLGCB_SPIRALED, dlg, req, NULL, DLG_DIR_DOWNSTREAM, 0); - // get_dlg has incremented the ref count by 1 - unref_dlg(dlg, 1); + run_dlg_callbacks( DLGCB_SPIRALED, dlg, req, NULL, + DLG_DIR_DOWNSTREAM, 0); + /* get_dlg() has incremented the ref count by 1 + * - it's ok, dlg will be used to set current_dialog_pointer */ goto finish; } } @@ -811,7 +823,6 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cb return -1; } - /* Populate initial varlist: */ dlg->vars = get_local_varlist_pointer(req, 1); @@ -826,13 +837,7 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cb goto error; } - if ( d_tmb.register_tmcb( req, t, - TMCB_RESPONSE_READY|TMCB_RESPONSE_FWDED, - dlg_onreply, (void*)dlg, unref_new_dialog)<0 ) { - LM_ERR("failed to register TMCB\n"); - goto error; - } - // increase reference counter because of registered callback + /* reference it once for current_dialog_pointer */ ref_dlg(dlg, 1); dlg->lifetime = get_dlg_timeout(req); @@ -847,6 +852,40 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cb if_update_stat( dlg_enable_stats, processed_dlgs, 1); finish: + set_current_dialog(req, dlg); + _dlg_ctx.dlg = dlg; + + return 0; + +error: + if (!spiral_detected) + unref_dlg(dlg,1); // undo ref regarding linking + return -1; +} + + +/*! + * \brief add dlg structure to tm callbacks + * \param t current transaction + * \param req current sip request + * \param dlg current dialog + * \param smode if the sip request was spiraled + * \return 0 on success, -1 on failure + */ +int dlg_set_tm_callbacks(tm_cell_t *t, sip_msg_t *req, dlg_cell_t *dlg, + int smode) +{ + if(smode==0) { + if ( d_tmb.register_tmcb( req, t, + TMCB_RESPONSE_READY|TMCB_RESPONSE_FWDED, + dlg_onreply, (void*)dlg, unref_new_dialog)<0 ) { + LM_ERR("failed to register TMCB\n"); + goto error; + } + // increase reference counter because of registered callback + ref_dlg(dlg, 1); + } + if (t) { // transaction exists ==> keep ref counter large enough to // avoid premature cleanup and ensure proper dialog referencing @@ -854,9 +893,7 @@ finish: LM_ERR("failed to store dialog in transaction\n"); goto error; } - } - else - { + } else { // no transaction exists ==> postpone work until we see the // request being forwarded statefully if ( d_tmb.register_tmcb( req, NULL, TMCB_REQUEST_FWDED, @@ -865,16 +902,10 @@ finish: goto error; } } - - set_current_dialog(req, dlg); - _dlg_ctx.dlg = dlg; - ref_dlg(dlg, 1); + dlg->dflags |= DLG_FLAG_TM; return 0; - error: - if (!spiral_detected) - unref_dlg(dlg,1); // undo ref regarding linking return -1; } diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index ecb6526..9a8854c 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -79,6 +79,8 @@ /* dialog-variable flags (in addition to dialog-flags) */ #define DLG_FLAG_DEL (1<<8) /*!< delete this var */ +#define DLG_FLAG_TM (1<<9) /*!< dialog is set in transaction */ + #define DLG_CALLER_LEG 0 /*!< attribute that belongs to a caller leg */ #define DLG_CALLEE_LEG 1 /*!< attribute that belongs to a callee leg */ diff --git a/modules_k/dialog/dlg_profile.c b/modules_k/dialog/dlg_profile.c index 2e69291..bb20c57 100644 --- a/modules_k/dialog/dlg_profile.c +++ b/modules_k/dialog/dlg_profile.c @@ -312,7 +312,12 @@ int profile_cleanup( struct sip_msg *msg, unsigned int flags, void *param ) { current_dlg_msg_id = 0; if (current_dlg_pointer) { - unref_dlg( current_dlg_pointer, 1); + if(current_dlg_pointer->dflags & DLG_FLAG_TM) { + unref_dlg( current_dlg_pointer, 1); + } else { + /* dialog didn't make it to tm */ + unref_dlg( current_dlg_pointer, 2); + } current_dlg_pointer = NULL; } if (current_pending_linkers) {

2 3

Kamailio IMS extensions branch
by Richard Good 02 Nov '11

02 Nov '11

Hi We are in the process of developing a branch for Kamailio IMS extensions held at *jason.penton/kamailio_ims_extensions *branch in the GIT repository. This branch largely originates from the Open IMS Core project and Carsten Block's Kamailio IMS branch with the intention of using core, tried and tested Kamailio modules (dialog, registrar, tm, usrloc, etc.) in place of the custom defined functionality in the Open IMS Core project. In the coming weeks we will push modules and cfg files to this branch to implement basic xCSCF functionality, so watch this space. Right now the branch includes stock standard Kamailio 3.3.x with an overhauled dialog2 module which is central to the functionality of the xCSCFs; and a slightly modified rr module (one additional method exposed to add mo/mt to the record-route). The dialog2 module implements the new dialog design according to: http://www.kamailio.org/dokuwiki/doku.php/modules-new-design:dialog-module-…. This allows for forked calls, concurrently confirmed calls and proxy initiated dialog termination for early and confirmed dialogs. - For each dialog there is now a dlg_cell structure with one or more dlg_out cell structures. - Forked calls have multiple dlg_out structures; once a call is confirmed all other dlg_out structures are removed except for the confirmed one. - Concurrent calls are allowed where multiple dialogs are confirmed at the same time - in this case a dlg_cell structure is created for each confirmed dialog. - Dialog's can be terminated as in the previous dialog module from mi, api and cfg; but this now also caters for terminating early state / unconfirmed dialogs. Still TO DO: Integrate old dialog functionality for dialog transfer, dialog database management, statistics and RPC functions and general bug fixes as they come up. API changes: Two new exposed methods *get_current_dialog* and * terminate_dlg_with_id* We want to get as many eyes on the code as possible to get it integrated into the master branch ASAP. Regards Richard.

3 3

"sql_buffer_size" causes crash in certain configurations
by Timo Teräs 01 Nov '11

01 Nov '11

Hi, I just upgraded to kam 3.2.0 and my config started crashed. I did some bisecting, until I came to commit 5cd87175faa97161023c37e2cc0f0c06 (core, srdb1, modules/db_*, modules_k/db_*: Added support for configuring SQL buffer size and mediumblob/mediumtext in MySQL) which seems to be the culprit. It seems that this commit broke things that were earlier possible. My existing configuration loads 'permissions' module before the 'db_postgres' module. This used to work perfectly well: the SQL modules were usable after loading without requiring initialization. After this commit, this causes segmentation fault with following backtrace: #0 0xb7fabeaf in memcpy () from /lib/libc.so.0.9.32 #1 0xb7fa5b78 in ?? () from /lib/libc.so.0.9.32 #2 0xb7fa7148 in ?? () from /lib/libc.so.0.9.32 #3 0xb7fa4b16 in vsnprintf () from /lib/libc.so.0.9.32 #4 0xb7fa4862 in snprintf () from /lib/libc.so.0.9.32 #5 0xb5a7a540 in db_do_query (_h=0xb7c4553c, _k=0xbffff614, _op=0x0, _v=0xbffff600, _c=0xbffff618, _n=1, _nc=1, _o=0x0, _r=0xbffff5fc, val2str=0xb56ef1c0 <db_postgres_val2str>, submit_query=0xb56f4a70 <db_postgres_submit_query>, store_result=0xb56f5350 <db_postgres_store_result>) at db_query.c:63 #6 0xb56f6a15 in db_postgres_query (_h=0xb7c4553c, _k=0xbffff614, _op=0x0, _v=0xbffff600, _c=0xbffff618, _n=1, _nc=1, _o=0x0, _r=0xbffff5fc) at km_dbase.c:370 #7 0xb5a7fdc9 in db_table_version (dbf=0xb5930be0, connection=0xb7c4553c, table=0xb59303f0) at db.c:378 #8 0xb5a8044a in db_check_table_version (dbf=0xb5930be0, dbh=0xb7c4553c, table=0xb59303f0, version=4) at db.c:416 #9 0xb591c6fe in init_addresses () at address.c:208 #10 0xb592238d in mod_init () at permissions.c:630 #11 0x001606d6 in init_mod (m=0xb7bc17f0) at sr_module.c:886 #12 0x0016064e in init_mod (m=0xb7bc1dc8) at sr_module.c:883 #13 0x0016064e in init_mod (m=0xb7bc23a8) at sr_module.c:883 #14 0x0016064e in init_mod (m=0xb7bc2a7c) at sr_module.c:883 #15 0x0016064e in init_mod (m=0xb7bc2ef4) at sr_module.c:883 #16 0x0016064e in init_mod (m=0xb7bc3430) at sr_module.c:883 #17 0x0016064e in init_mod (m=0xb7bc37a8) at sr_module.c:883 #18 0x0016064e in init_mod (m=0xb7bc3c2c) at sr_module.c:883 #19 0x0016064e in init_mod (m=0xb7bc3fa4) at sr_module.c:883 #20 0x0016064e in init_mod (m=0xb7bc4da0) at sr_module.c:883 #21 0x00161729 in init_modules () at sr_module.c:913 #22 0x00128957 in main (argc=7, argv=0xbffffd14) at main.c:2412 This is because db_do_query gets called (from permissions module when it checks table version) before the database module was initialized (and thus, db_query_init was not yet called). Now, I'm not sure if the previous behaviour is to be required. But at least we should not crash if the module ordering is not right. Peter, please fix the code to either work as before, or give proper error message and exit (instead of crashing). Thanks, Timo

3 2

git:master: utils/sercmd: set SRNAME at compile time
by Daniel-Constantin Mierla 31 Oct '11

31 Oct '11

Module: sip-router Branch: master Commit: 1b58b26b7ccf7b2c01185a22ad076a3655e43664 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b58b26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 31 17:18:11 2011 +0100 utils/sercmd: set SRNAME at compile time - it is set to sip server name (e.g., ser, kamailio) - it is used to build the default path to ctl file used to communicate with sip server via ctl module - reported by Henning Westerholt --- utils/sercmd/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/sercmd/Makefile b/utils/sercmd/Makefile index bc03b74..2cb406a 100644 --- a/utils/sercmd/Makefile +++ b/utils/sercmd/Makefile @@ -22,7 +22,7 @@ endif #ifneq (,$(MAKECMDGOALS)) # erase common DEFS (not needed) C_DEFS:= -DEFS:= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' \ +DEFS:= -DNAME='"$(NAME)"' -DSRNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' \ $(filter -D%HAVE -DARCH% -DOS% -D__CPU% -D__OS%, $(DEFS)) # use proper libs (we can't rely on LIBS value since we might be called

1 1

git:master: ctl: used flavour's NAME in path of default ctl socket
by Daniel-Constantin Mierla 31 Oct '11

31 Oct '11

Module: sip-router Branch: master Commit: df4dfe61500f4ada6051f0d7c74824efa3c2c628 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df4dfe6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Oct 15 23:02:09 2011 +0200 ctl: used flavour's NAME in path of default ctl socket --- modules/ctl/ctl_defaults.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ctl/ctl_defaults.h b/modules/ctl/ctl_defaults.h index 6ac7658..c50af47 100644 --- a/modules/ctl/ctl_defaults.h +++ b/modules/ctl/ctl_defaults.h @@ -4,7 +4,7 @@ #ifndef __ctl_defaults_h #define __ctl_defaults_h /*listen by default on: */ -#define DEFAULT_CTL_SOCKET "unixs:/tmp/ser_ctl" +#define DEFAULT_CTL_SOCKET "unixs:/tmp/" NAME "_ctl" /* port used by default for tcp/udp if no port is explicitely specified */ #define DEFAULT_CTL_PORT 2049

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2011