sr-dev

sr-dev@lists.kamailio.org

13 participants
44200 discussions

by Jan Janak

Module: sip-router Branch: master Commit: 2d09ec6c90ac6e18a6d373ef61cf0ac9d6972696 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d09ec6… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 02:30:45 2009 +0100 Alias LM_NOTICE to NOTICE --- dprint.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dprint.h b/dprint.h index 842cba8..156d051 100644 --- a/dprint.h +++ b/dprint.h @@ -302,7 +302,7 @@ int log_facility_fixup(void *handle, str *name, void **val); #define LM_CRIT CRIT #define LM_ERR ERR #define LM_WARN WARN -#define LM_NOTICE +#define LM_NOTICE NOTICE #define LM_INFO INFO #define LM_DBG DEBUG

15 years, 10 months

git:janakj/kcore: Kamailio functions and macros missing in sip-router/ut.h

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: 15bb433960da81e252ed25973a27897bc96228c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=15bb433… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 00:36:29 2009 +0100 Kamailio functions and macros missing in sip-router/ut.h This is the supplemental file to sip-router/ut.h, the contents of this file was taken from kamailio/ut.h and it contains only functions, variables and defines which are missing in sip-router/ut.h Kamailio modules that included ut.h should be modified to include "lib/kcore/km_ut.h" _in addition to_ "../../ut.h" --- lib/kcore/km_ut.h | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 120 insertions(+), 0 deletions(-) diff --git a/lib/kcore/km_ut.h b/lib/kcore/km_ut.h new file mode 100644 index 0000000..43fc11b --- /dev/null +++ b/lib/kcore/km_ut.h @@ -0,0 +1,120 @@ +/* + *$Id$ + * + * - various general purpose functions + * + * Copyright (C) 2001-2003 FhG Fokus + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +/*! + * \file + * \brief Various utility functions, mostly related to string handling + */ + +#ifndef _KM_UT_H +#define _KM_UT_H + +#include "../../ut.h" + +#ifndef MIN +#define MIN(a, b) (a<b?a:b) +#endif +#ifndef MAX +#define MAX(a, b) (a>b?a:b) +#endif + + +#define append_str(_dest,_src,_len) \ + do{ \ + memcpy( (_dest) , (_src) , (_len) ); \ + (_dest) += (_len) ; \ + }while(0); \ + + + +/* INTeger-TO-Buffer-STRing : convers an unsigned long to a string + * IMPORTANT: the provided buffer must be at least INT2STR_MAX_LEN size !! */ +static inline char* int2bstr(unsigned long l, char *s, int* len) +{ + int i; + i=INT2STR_MAX_LEN-2; + s[INT2STR_MAX_LEN-1]=0; + /* null terminate */ + do{ + s[i]=l%10+'0'; + i--; + l/=10; + }while(l && (i>=0)); + if (l && (i<0)){ + LM_CRIT("overflow error\n"); + } + if (len) *len=(INT2STR_MAX_LEN-2)-i; + return &s[i+1]; +} + + +inline static int hexstr2int(char *c, int len, unsigned int *val) +{ + char *pc; + int r; + char mychar; + + r=0; + for (pc=c; pc<c+len; pc++) { + r <<= 4 ; + mychar=*pc; + if ( mychar >='0' && mychar <='9') r+=mychar -'0'; + else if (mychar >='a' && mychar <='f') r+=mychar -'a'+10; + else if (mychar >='A' && mychar <='F') r+=mychar -'A'+10; + else return -1; + } + *val = r; + return 0; +} + + + +/* + * Convert a str (base 10 or 16) into integer + */ +static inline int strno2int( str *val, unsigned int *mask ) +{ + /* hexa or decimal*/ + if (val->len>2 && val->s[0]=='0' && val->s[1]=='x') { + return hexstr2int( val->s+2, val->len-2, mask); + } else { + return str2int( val, mask); + } +} + + + +/*! right and left space trimming */ +#define trim_spaces_lr(_s_) \ + do{ \ + for(;(_s_).s[(_s_).len-1]==' ';(_s_).s[--(_s_).len]=0); \ + for(;(_s_).s[0]==' ';(_s_).s=(_s_).s+1,(_s_).len--); \ + \ + } \ + while(0); \ + + + +#endif /* _KM_UT_H */

15 years, 10 months

git:janakj/kcore: Files local_route.[ch] from kamailio core add to libkcore

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: bf3d622b425765640287b00f90755709a0d66007 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf3d622… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 00:40:19 2009 +0100 Files local_route.[ch] from kamailio core add to libkcore Kamailio modules that include "../../local_route.h" should be updated to include "../../lib/kcore/local_route.h" instead. --- lib/kcore/local_route.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++ lib/kcore/local_route.h | 42 +++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 0 deletions(-) diff --git a/lib/kcore/local_route.c b/lib/kcore/local_route.c new file mode 100644 index 0000000..ba2f156 --- /dev/null +++ b/lib/kcore/local_route.c @@ -0,0 +1,78 @@ +/* + *$Id: local_route.c 5132 2008-10-24 11:49:14Z miconda $ + * + * Copyright (C) 2001-2003 FhG Fokus + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/*! + * \file + * \brief Local Route related functions. + */ + +#include <string.h> + +#include "../../dprint.h" +#include "../../mem/mem.h" + +#include "local_route.h" + +static lrt_info_t* lrt_info_list = 0; +static int lrt_info_no = 0; + + +int lrt_do_init_child(void) +{ + int i; + + for ( i=0; i< lrt_info_no; i++ ) + { + if ( lrt_info_list[i].init && lrt_info_list[i].init()!=0 ) + { + LM_ERR("failed to init child for local route <%s>\n", + lrt_info_list[i].name); + return -1; + } + } + return 0; +} + +int register_lrt_info(lrt_info_t *lrti) +{ + lrt_info_t *l; + + if(lrti==NULL || lrti->name==NULL || lrti->init==NULL) + return 0; + + l = (lrt_info_t*)pkg_realloc(lrt_info_list, + (lrt_info_no+1)*sizeof(lrt_info_t)); + if (l==0) + { + LM_ERR("no more pkg memory\n"); + return -1; + } + + lrt_info_list = l; + lrt_info_list[lrt_info_no].init = lrti->init; + lrt_info_list[lrt_info_no].name = lrti->name; + lrt_info_no++; + + return 0; +} + + diff --git a/lib/kcore/local_route.h b/lib/kcore/local_route.h new file mode 100644 index 0000000..fe1da2c --- /dev/null +++ b/lib/kcore/local_route.h @@ -0,0 +1,42 @@ +/* + *$Id: local_route.h 5132 2008-10-24 11:49:14Z miconda $ + * + * Copyright (C) 2001-2003 FhG Fokus + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/*! + * \file + * \brief Local Route related functions. + */ + +#ifndef _LOCAL_ROUTE_H_ +#define _LOCAL_ROUTE_H_ + +typedef int (lrt_child_init_f)(void); + +typedef struct _lrt_info { + char *name; + lrt_child_init_f *init; +} lrt_info_t; + +int lrt_do_init_child(void); +int register_lrt_info(lrt_info_t *lrti); + +#endif +

15 years, 10 months

git:janakj/kcore: File radius.h from kamailio core added to libkcore

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: 02363feec26cc2ec858badf0ac30c97d4fbb398f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=02363fe… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 00:51:43 2009 +0100 File radius.h from kamailio core added to libkcore This file was originally located at kamailio/radius.h, since the file is missing from the sip router core we need to put it in the library. --- lib/kcore/radius.h | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 136 insertions(+), 0 deletions(-) diff --git a/lib/kcore/radius.h b/lib/kcore/radius.h new file mode 100644 index 0000000..92a44af --- /dev/null +++ b/lib/kcore/radius.h @@ -0,0 +1,136 @@ +/* + * Copyright (C) 2001-2003 FhG Fokus + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * WARNING: Don't forget to update the dictionary if you update this file !!! + * + * History: + * -------- + * 2005-06-28 multi leg call support added (bogdan) + * 2008-09-03 added type field to attribute structure, which is set + * during INIT_AV. + * + */ + +/*! + * \file + * \brief Radius support + */ + + +#ifndef _RADIUS_CORE_H +#define _RADIUS_CORE_H + +#ifndef USE_FREERADIUS + #include <radiusclient-ng.h> + #define DEFAULT_RADIUSCLIENT_CONF \ + "/usr/local/etc/radiusclient-ng/radiusclient.conf" +#else + #include <freeradius-client.h> + #define DEFAULT_RADIUSCLIENT_CONF "" +#endif + + +struct attr { + const char *n; + int v; + unsigned int t; /* type of attribute */ +}; + +struct val { + const char *n; + int v; +}; + +#define A_USER_NAME 0 +#define A_SERVICE_TYPE 1 +#define A_CALLED_STATION_ID 2 +#define A_CALLING_STATION_ID 3 +#define A_ACCT_STATUS_TYPE 4 +#define A_ACCT_SESSION_ID 5 +#define A_SIP_METHOD 6 +#define A_SIP_RESPONSE_CODE 7 +#define A_SIP_CSEQ 8 +#define A_SIP_TO_TAG 9 +#define A_SIP_FROM_TAG 10 +#define A_DIGEST_RESPONSE 11 +#define A_DIGEST_ATTRIBUTES 12 +#define A_SIP_URI_USER 13 +#define A_SIP_URI_HOST 14 +#define A_DIGEST_REALM 15 +#define A_DIGEST_NONCE 16 +#define A_DIGEST_METHOD 17 +#define A_DIGEST_URI 18 +#define A_DIGEST_QOP 19 +#define A_DIGEST_ALGORITHM 20 +#define A_DIGEST_BODY_DIGEST 21 +#define A_DIGEST_CNONCE 22 +#define A_DIGEST_NONCE_COUNT 23 +#define A_DIGEST_USER_NAME 24 +#define A_SIP_GROUP 25 +#define A_CISCO_AVPAIR 26 +#define A_SIP_AVP 27 +#define A_TIME_STAMP 28 +#define A_SIP_CALL_ID 29 +#define A_SIP_REQUEST_HASH 30 +#define A_MAX 31 + +#define V_STATUS_START 0 +#define V_STATUS_STOP 1 +#define V_STATUS_FAILED 2 +#define V_CALL_CHECK 3 +#define V_SIP_SESSION 4 +#define V_GROUP_CHECK 5 +#define V_SIP_CALLER_AVPS 6 +#define V_SIP_CALLEE_AVPS 7 +#define V_SIP_VERIFY_DESTINATION 8 +#define V_SIP_VERIFY_SOURCE 9 +#define V_MAX 10 + +#define INIT_AV(rh, at, nr_at, vl, nr_vl, fn, e1, e2) \ +{ \ + int i; \ + DICT_ATTR *da; \ + DICT_VALUE *dv; \ + \ + for (i = 0; i < nr_at; i++) { \ + if (at[i].n == NULL) \ + continue; \ + da = rc_dict_findattr(rh, at[i].n); \ + if (da == NULL) { \ + LM_ERR("%s: can't get code for the " \ + "%s attribute\n", fn, at[i].n); \ + return e1; \ + } \ + at[i].v = da->value; \ + at[i].t = da->type; \ + } \ + for (i = 0; i < nr_vl; i++) { \ + if (vl[i].n == NULL) \ + continue; \ + dv = rc_dict_findval(rh, vl[i].n); \ + if (dv == NULL) { \ + LM_ERR("%s: can't get code for the " \ + "%s attribute value\n", fn, vl[i].n);\ + return e2; \ + } \ + vl[i].v = dv->value; \ + } \ +} + +#endif

15 years, 10 months

git:master: Function load_tm_api added

by Jan Janak

Module: sip-router Branch: master Commit: bb21bd2e4699b7a5f15a91ee779ddd6174df307a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb21bd2… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 01:04:36 2009 +0100 Function load_tm_api added There are many modules that need to access the API of tm module and they all have to go through the same step of commands to bind the API exported by the tm module. It makes more sense to create one function which does it all and make that function available to all other modules using tm. Signed-off-by: Jan Janak <jan(a)iptel.org> --- modules/tm/tm_load.h | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index 8e67dcc..dc00a91 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -140,4 +140,23 @@ typedef int(*load_tm_f)( struct tm_binds *tmb ); int load_tm( struct tm_binds *tmb); +static inline int load_tm_api(struct tm_binds* tmb) +{ + load_tm_f load_tm; + + /* import the TM auto-loading function */ + load_tm = (load_tm_f)find_export("load_tm", NO_SCRIPT, 0); + + if (load_tm == NULL) { + LOG(L_ERR, "Cannot import load_tm function from tm module\n"); + return -1; + } + + /* let the auto-loading function load all TM stuff */ + if (load_tm(tmb) == -1) { + return -1; + } + return 0; +} + #endif

15 years, 10 months

git:master: A comment warning about flag FL_REQ_UPSTREAM.

by Jan Janak

Module: sip-router Branch: master Commit: 00dbf3d788404cd97821e4d5873e843b4f0aec4e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=00dbf3d… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 2 23:20:31 2009 +0100 A comment warning about flag FL_REQ_UPSTREAM. This patch adds a comment warning about flag FL_REQ_UPSTREAM which is defined in kamailio module acc and uses the value (1<<11) in sip message flags. This flags was originally defined in this file, but since the kamailio acc module is the only module setting and using the flag. I think it would make more sense to define it in the module itself before we merge ser and kamailio acc implementations (then the flag probably won't be needed anymore because the test for the direction of the message is trivial and there is no need to set the flag in the sip message, especially if it is not being used by any other module). Signed-off-by: Jan Janak <jan(a)iptel.org> --- parser/msg_parser.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 98f98aa..b1541b7 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -96,6 +96,10 @@ enum request_method { METHOD_UNDEF=0, METHOD_INVITE=1, METHOD_CANCEL=2, METHOD_A #define FL_MTU_TCP_FB (1 << 8) #define FL_MTU_TLS_FB (1 << 9) #define FL_MTU_SCTP_FB (1 << 10) + +/* WARNING: Value (1 << 11) is temporarily reserved for use in kamailio acc + * module (flag FL_REQ_UPSTREAM)! */ + #define FL_MTU_FB_MASK (FL_MTU_TCP_FB|FL_MTU_TLS_FB|FL_MTU_SCTP_FB)

15 years, 10 months

git:master: Merge branch 'ser_core_cvs'

by Jan Janak

Module: sip-router Branch: master Commit: f26ebd4ed44b38f7dcce2151b27821e986ef2d36 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f26ebd4… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 2 22:53:11 2009 +0100 Merge branch 'ser_core_cvs' * ser_core_cvs: Replace explicit flag values with bit shifts for better readability ---

15 years, 10 months

git:master: Replace explicit flag values with bit shifts for better readability

by Jan Janak

Module: sip-router Branch: master Commit: ccc294fcdb10ab0dbc40aa1396f6dc132d674753 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ccc294f… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 2 21:42:09 2009 +0000 Replace explicit flag values with bit shifts for better readability --- parser/msg_parser.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index ffa3e19..98f98aa 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -82,20 +82,20 @@ enum request_method { METHOD_UNDEF=0, METHOD_INVITE=1, METHOD_CANCEL=2, METHOD_A METHOD_NOTIFY=128, METHOD_MESSAGE=256, METHOD_OPTIONS=512, METHOD_OTHER=1024 }; -#define FL_FORCE_RPORT 1 /* force rport */ -#define FL_FORCE_ACTIVE 2 /* force active SDP */ -#define FL_SDP_IP_AFS 4 /* SDP IP rewritten */ -#define FL_SDP_PORT_AFS 8 /* SDP port rewritten */ -#define FL_SHM_CLONE 16 /* msg cloned in SHM as a single chunk */ -#define FL_TIMEOUT 32 /* message belongs to an "expired" branch - (for failure route use) */ -#define FL_REPLIED 64 /* message branch received at least one reply - (for failure route use) */ -#define FL_HASH_INDEX 128 /* msg->hash_index contains a valid value (tm use)*/ - -#define FL_MTU_TCP_FB 256 -#define FL_MTU_TLS_FB 512 -#define FL_MTU_SCTP_FB 1024 +#define FL_FORCE_RPORT (1 << 0) /* force rport */ +#define FL_FORCE_ACTIVE (1 << 1) /* force active SDP */ +#define FL_SDP_IP_AFS (1 << 2) /* SDP IP rewritten */ +#define FL_SDP_PORT_AFS (1 << 3) /* SDP port rewritten */ +#define FL_SHM_CLONE (1 << 4) /* msg cloned in SHM as a single chunk */ +#define FL_TIMEOUT (1 << 5) /* message belongs to an "expired" branch + (for failure route use) */ +#define FL_REPLIED (1 << 6) /* message branch received at least one reply + (for failure route use) */ +#define FL_HASH_INDEX (1 << 7) /* msg->hash_index contains a valid value (tm use)*/ + +#define FL_MTU_TCP_FB (1 << 8) +#define FL_MTU_TLS_FB (1 << 9) +#define FL_MTU_SCTP_FB (1 << 10) #define FL_MTU_FB_MASK (FL_MTU_TCP_FB|FL_MTU_TLS_FB|FL_MTU_SCTP_FB)

15 years, 10 months

git:janakj/kcore: New shared library libkcore

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: 96b479a017db26d450ceaec29b2d13c450ac6949 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96b479a… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 2 22:48:43 2009 +0100 New shared library libkcore This is a new shared library which will contain all things from kamailio core that are not yet present in the sip-router core. --- lib/kcore/Makefile | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/lib/kcore/Makefile b/lib/kcore/Makefile new file mode 100644 index 0000000..4198f4e --- /dev/null +++ b/lib/kcore/Makefile @@ -0,0 +1,9 @@ +include ../../Makefile.defs +auto_gen= +NAME:=kcore +MAJOR_VER=1 +MINOR_VER=0 +BUGFIX_VER=0 +LIBS= + +include ../../Makefile.libs

15 years, 10 months

git:master: Add the possibility to override logging facility.

by Jan Janak

Module: sip-router Branch: master Commit: f5618c1a54e9190bda9057f07caf700d0c96ca65 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f5618c1… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 2 17:23:17 2009 +0100 Add the possibility to override logging facility. This patch adds adds a new parameter to LOG_ which makes it possible to override the logging facility configured through the config framework. Modules then can opt to specify a different logging facility than the one configured globally in the sip router. The is currently used by the acc module from kamailio. The first parameter of LOG_ is now facility. You can set the parameter to DEFAULT_FACILITY and in that case the facility configured through the config framework of the sip router will be used. The value of DEFAULT_FACILITY is 0 which is equal to LOG_KERN on linux systems. This means that you cannot set the logging facility to LOG_KERN from modules calling LOG_ directly because then the logging facility configured through the config framework will be used. This patch also adds a new macro called LOG_FC which works just like LOG macro except that the first parameter of LOG_FC is the logging facility to be used. And finally there is a new macro called LM_GEN2, this is one of the kamailio compatibility macros and it is just a different name for LOG_FC. Signed-off-by: Jan Janak <jan(a)iptel.org> --- dprint.h | 55 ++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 40 insertions(+), 15 deletions(-) diff --git a/dprint.h b/dprint.h index 12521f5..842cba8 100644 --- a/dprint.h +++ b/dprint.h @@ -81,6 +81,11 @@ #define L_INFO 2 #define L_DBG 3 +/* This is the facility value used to indicate that the caller of the macro + * did not override the facility. Value 0 (the defaul) is LOG_KERN on Linux + */ +#define DEFAULT_FACILITY 0 + #define LOG_LEVEL2NAME(level) (log_level_info[(level) - (L_ALERT)].name) #define LOG2SYSLOG_LEVEL(level) \ (log_level_info[(level) - (L_ALERT)].syslog_level) @@ -125,11 +130,13 @@ int log_facility_fixup(void *handle, str *name, void **val); #ifdef NO_LOG # ifdef __SUNPRO_C -# define LOG_(level, prefix, fmt, ...) +# define LOG_(facility, level, prefix, fmt, ...) # define LOG(level, fmt, ...) +# define LOG_FC(facility, level, fmt, ...) # else -# define LOG_(level, prefix, fmt, args...) +# define LOG_(facility, level, prefix, fmt, args...) # define LOG(level, fmt, args...) +# define LOG_FC(facility, level, fmt, args...) # endif #else @@ -145,7 +152,7 @@ int log_facility_fixup(void *handle, str *name, void **val); # endif # ifdef __SUNPRO_C -# define LOG_(level, prefix, fmt, ...) \ +# define LOG_(facility, level, prefix, fmt, ...) \ do { \ if (unlikely(cfg_get(core, core_cfg, debug) >= (level) && \ DPRINT_NON_CRIT)) { \ @@ -158,7 +165,9 @@ int log_facility_fixup(void *handle, str *name, void **val); __VA_ARGS__); \ } else { \ syslog(LOG2SYSLOG_LEVEL(level) | \ - cfg_get(core, core_cfg, log_facility),\ + (((facility) != DEFAULT_FACILITY) ? \ + (facility) : \ + cfg_get(core, core_cfg, log_facility)), \ "%s: %s" fmt, LOG_LEVEL2NAME(level),\ (prefix), __VA_ARGS__); \ } \ @@ -170,22 +179,29 @@ int log_facility_fixup(void *handle, str *name, void **val); } else { \ if ((level)<L_ALERT) \ syslog(LOG2SYSLOG_LEVEL(L_ALERT) | \ - cfg_get(core, core_cfg, log_facility),\ - "%s" fmt, (prefix), __VA_ARGS__); \ + (((facility) != DEFAULT_FACILITY) ? \ + (facility) : \ + cfg_get(core, core_cfg, log_facility)),\ + "%s" fmt, (prefix), __VA_ARGS__); \ else \ syslog(LOG2SYSLOG_LEVEL(L_DBG) | \ - cfg_get(core, core_cfg, log_facility),\ - "%s" fmt, (prefix), __VA_ARGS__); \ + (((facility) != DEFAULT_FACILITY) ? \ + (facility) : \ + cfg_get(core, core_cfg, log_facility)),\ + "%s" fmt, (prefix), __VA_ARGS__); \ } \ } \ DPRINT_CRIT_EXIT; \ } \ } while(0) -# define LOG(level, fmt, ...) LOG_((level), LOC_INFO, fmt, __VA_ARGS__) +# define LOG(level, fmt, ...) \ + LOG_(DEFAULT_FACILITY, (level), LOC_INFO, fmt, __VA_ARGS__) +# define LOG_FC(facility, level, fmt, ...) \ + LOG_((facility), (level), LOC_INFO, fmt, __VA_ARGS__) # else /* ! __SUNPRO_C */ -# define LOG_(level, prefix, fmt, args...) \ +# define LOG_(facility, level, prefix, fmt, args...) \ do { \ if (cfg_get(core, core_cfg, debug) >= (level) && \ DPRINT_NON_CRIT) { \ @@ -197,7 +213,9 @@ int log_facility_fixup(void *handle, str *name, void **val); LOG_LEVEL2NAME(level),(prefix), ## args);\ } else { \ syslog(LOG2SYSLOG_LEVEL(level) |\ - cfg_get(core, core_cfg, log_facility), \ + (((facility) != DEFAULT_FACILITY) ? \ + (facility) : \ + cfg_get(core, core_cfg, log_facility)), \ "%s: %s" fmt, LOG_LEVEL2NAME(level),\ (prefix), ## args); \ } \ @@ -209,11 +227,15 @@ int log_facility_fixup(void *handle, str *name, void **val); } else { \ if ((level)<L_ALERT) \ syslog(LOG2SYSLOG_LEVEL(L_ALERT) | \ - cfg_get(core, core_cfg, log_facility),\ + (((facility) != DEFAULT_FACILITY) ? \ + (facility) : \ + cfg_get(core, core_cfg, log_facility)),\ "%s" fmt, (prefix), ## args); \ else \ syslog(LOG2SYSLOG_LEVEL(L_DBG) | \ - cfg_get(core, core_cfg, log_facility),\ + (((facility) != DEFAULT_FACILITY) ? \ + (facility) : \ + cfg_get(core, core_cfg, log_facility)),\ "%s" fmt, (prefix), ## args); \ } \ } \ @@ -221,7 +243,10 @@ int log_facility_fixup(void *handle, str *name, void **val); } \ } while(0) -# define LOG(level, fmt, args...) LOG_((level), LOC_INFO, fmt, ## args) +# define LOG(level, fmt, args...) \ + LOG_(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) +# define LOG_FC(facility, level, fmt, args...) \ + LOG_((facility), (level), LOC_INFO, fmt, ## args) # endif /* __SUNPRO_C */ #endif /* NO_LOG */ @@ -272,7 +297,7 @@ int log_facility_fixup(void *handle, str *name, void **val); /* kamailio/openser compatibility */ #define LM_GEN1 LOG - +#define LM_GEN2 LOG_FC #define LM_ALERT ALERT #define LM_CRIT CRIT #define LM_ERR ERR

15 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev