sr-dev September 2010

sr-dev@lists.kamailio.org

25 participants
222 discussions

git:master: xcap_server: set content-type per auid in reply

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 406f43b42f8d5ef015d4fd7b1e17158430be7b2e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=406f43b… Author: root <root(a)boyce.voipuser.org> Committer: root <root(a)boyce.voipuser.org> Date: Tue Sep 21 13:09:42 2010 +0100 xcap_server: set content-type per auid in reply - accept also xcap-caps auid --- modules_k/xcap_server/xcap_misc.c | 4 ++++ modules_k/xcap_server/xcap_server.c | 19 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/modules_k/xcap_server/xcap_misc.c b/modules_k/xcap_server/xcap_misc.c index 1c844e7..103d218 100644 --- a/modules_k/xcap_server/xcap_misc.c +++ b/modules_k/xcap_server/xcap_misc.c @@ -145,6 +145,10 @@ int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri) LM_DBG("matched resource-lists\n"); xuri->type = RESOURCE_LIST; xuri->auid.len = 14; + } else if(s.len>10 && strncmp(s.s, "xcap-caps/", 10)==0) { + LM_DBG("matched xcap-caps\n"); + xuri->type = XCAP_CAPS; + xuri->auid.len = 9; } else { LM_ERR("unsupported auid in [%.*s]\n", xuri->uri.len, xuri->uri.s); diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c index 4f5d5c0..d37c860 100644 --- a/modules_k/xcap_server/xcap_server.c +++ b/modules_k/xcap_server/xcap_server.c @@ -403,6 +403,13 @@ static str xcaps_str_ok = {"OK", 2}; static str xcaps_str_srverr = {"Server error", 12}; static str xcaps_str_nocontent = {"No content", 10}; static str xcaps_str_appxml = {"application/xml", 15}; +static str xcaps_str_apprlxml = {"application/resource-lists+xml", 30}; +static str xcaps_str_apprsxml = {"application/rls-services+xml", 28}; +#if 0 +static str xcaps_str_appxcxml = {"application/xcap-caps+xml", 25}; +#endif +static str xcaps_str_appapxml = {"application/auth-policy+xml", 27}; + /** * @@ -721,6 +728,7 @@ static int w_xcaps_get(sip_msg_t* msg, char* puri, char* ppath) str body; int ret = 0; xcap_uri_t xuri; + str *ctype; if(puri==0 || ppath==0) { @@ -771,11 +779,18 @@ static int w_xcaps_get(sip_msg_t* msg, char* puri, char* ppath) if(ret==0) { /* doc found */ + ctype = &xcaps_str_appxml; + if(xuri.type==RESOURCE_LIST) + ctype = &xcaps_str_apprlxml; + else if(xuri.type==PRES_RULES) + ctype = &xcaps_str_appapxml; + else if(xuri.type==RLS_SERVICE) + ctype = &xcaps_str_apprsxml; xcaps_send_reply(msg, 200, &xcaps_str_ok, &etag, - &xcaps_str_appxml, &body); + ctype, &body); } else { /* doc not found */ - xcaps_send_reply(msg, 204, &xcaps_str_nocontent, &xcaps_str_empty, + xcaps_send_reply(msg, 200, &xcaps_str_nocontent, &xcaps_str_empty, &xcaps_str_empty, &xcaps_str_empty); } return 1;

13 years, 8 months

git:master: core: tcp_read.c insensitive search for HTTP11 headers

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 33f8efe0ee6af800cfb0e870be3e0c9626a5110f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33f8efe… Author: root <root(a)boyce.voipuser.org> Committer: root <root(a)boyce.voipuser.org> Date: Tue Sep 21 13:11:33 2010 +0100 core: tcp_read.c insensitive search for HTTP11 headers --- tcp_read.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/tcp_read.c b/tcp_read.c index b8be180..1fe5a91 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -122,16 +122,39 @@ static struct local_timer tcp_reader_ltimer; static ticks_t tcp_reader_prev_ticks; #ifdef READ_HTTP11 +static inline char *strfindcasestrz(str *haystack, char *needlez) +{ + int i,j; + str needle; + + needle.s = needlez; + needle.len = strlen(needlez); + for(i=0;i<haystack->len-needle.len;i++) { + for(j=0;j<needle.len;j++) { + if ( !((haystack->s[i+j]==needle.s[j]) || + ( isalpha((int)haystack->s[i+j]) + && ((haystack->s[i+j])^(needle.s[j]))==0x20 )) ) + break; + } + if (j==needle.len) + return haystack->s+i; + } + return 0; +} + int tcp_http11_continue(struct tcp_connection *c) { struct dest_info dst; char *p; struct msg_start fline; int ret; + str msg; ret = 0; - p = parse_first_line(c->req.buf, c->req.pos - c->req.buf, &fline); + msg.s = c->req.start; + msg.len = c->req.pos - c->req.start; + p = parse_first_line(msg.s, msg.len, &fline); if(p==NULL) return 0; @@ -145,7 +168,7 @@ int tcp_http11_continue(struct tcp_connection *c) return 0; /* check for Expect header */ - if(strstr(c->req.start, "Expect: 100-continue")!=NULL) + if(strfindcasestrz(&msg, "Expect: 100-continue")!=NULL) { init_dst_from_rcv(&dst, &c->rcv); if (tcp_send(&dst, 0, HTTP11CONTINUE, HTTP11CONTINUE_LEN) < 0) { @@ -153,7 +176,7 @@ int tcp_http11_continue(struct tcp_connection *c) } } /* check for Transfer-Encoding header */ - if(strstr(c->req.start, "Transfer-Encoding: chunked")!=NULL) + if(strfindcasestrz(&msg, "Transfer-Encoding: chunked")!=NULL) { c->req.flags |= F_TCP_REQ_BCHUNKED; ret = 1;

13 years, 8 months

git:master: core: no 2nd via log message set to info level

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2df94c0f9a1c1a797fef4508863a7bb985c8f10b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2df94c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 20 17:43:38 2010 +0200 core: no 2nd via log message set to info level - replies to self requests have no 2nd via --- forward.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/forward.c b/forward.c index c071416..9e675da 100644 --- a/forward.c +++ b/forward.c @@ -754,7 +754,7 @@ int forward_reply(struct sip_msg* msg) || (msg->via2==0) || (msg->via2->error!=PARSE_OK)) { /* no second via => error */ - LOG(L_ERR, "ERROR: forward_reply: no 2nd via found in reply\n"); + LOG(L_INFO, "broken reply to forward - no 2nd via\n"); goto error; }

13 years, 8 months

git:master: xcap_client: include mi header file

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d54b0b8a4a3bdb1ff3170c723f8e5d83549f1016 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d54b0b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 20 17:01:14 2010 +0200 xcap_client: include mi header file --- modules_k/xcap_client/xcap_client.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/xcap_client/xcap_client.c b/modules_k/xcap_client/xcap_client.c index 6d196ff..0551c67 100644 --- a/modules_k/xcap_client/xcap_client.c +++ b/modules_k/xcap_client/xcap_client.c @@ -44,6 +44,7 @@ #include "../../ut.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" +#include "../../lib/kmi/mi.h" #include "../presence/utils_func.h" #include "xcap_functions.h" #include "xcap_client.h"

13 years, 8 months

git:master: kamctl: more auto-discovery for sercmd

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cff8540d95c53ee3972205e838f4528f67f9357b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cff8540… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 20 11:04:46 2010 +0200 kamctl: more auto-discovery for sercmd - try locations like same dir with kamctl, or ../sercmd/ in case is run from sources - default names for sercmd commands are 'sercmd' and 'sercmd_mi' to match tool name as ser is another application, old names can still be used --- utils/kamctl/kamctl | 41 ++++++++++++++++++++++++++++++++++------- utils/kamctl/kamctl.ser | 12 ++++-------- utils/kamctl/kamctl.ser_mi | 10 +++------- 3 files changed, 41 insertions(+), 22 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 09a0fb8..e5252a5 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -6,6 +6,9 @@ # #=================================================================== +### version for this script +VERSION='3.1.0' + PATH=$PATH:/usr/local/sbin/ # for testing only, please don't enable this in production environments @@ -36,9 +39,6 @@ if [ -z "$ETCDIR" ] ; then ETCDIR="/usr/local/etc/kamailio" fi -### version for this script -VERSION='$Revision$' - if [ -z "$MYDIR" ] ; then MYDIR=`dirname $0` fi @@ -50,6 +50,33 @@ if [ -z "$MYLIBDIR" ] ; then fi fi +# locate sercmd +if [ -z "$SERCMD" ] ; then + # try same dir as kamctl + SERCMD="$MYDIR/sercmd" + if [ ! -f "$SERCMD" -o ! -x "$SERCMD" ] ; then + # try standard location installed from sources + SERCMD="/usr/local/sbin/sercmd" + if [ ! -f "$SERCMD" -o ! -x "$SERCMD" ] ; then + # try source tree location + SERCMD="$MYDIR/../sercmd/sercmd" + if [ ! -f "$SERCMD" -o ! -x "$SERCMD" ] ; then + # try locate it with which + SERCMD=`which sercmd` + if [ ! -f "$SERCMD" -o ! -x "$SERCMD" ] ; then + merr "sercmd tool not found" + exit -1; + fi + fi + fi + fi +else + if [ ! -f "$SERCMD" -o ! -x "$SERCMD" ] ; then + merr "SERCMD does not point to an executable file" + exit -1; + fi +fi + ##### ------------------------------------------------ ##### ### load base functions # @@ -127,7 +154,7 @@ case $CTLENGINE in CTLENGINELOADED=1 fi ;; - SER_MI|ser_mi) + SER_MI|ser_mi|SERCMD_MI|sercmd_mi|SERCMDMI|sercmdmi) if [ -f "$MYLIBDIR/kamctl.ser_mi" ]; then . "$MYLIBDIR/kamctl.ser_mi" CTLENGINELOADED=1 @@ -136,7 +163,7 @@ case $CTLENGINE in esac #### ------------------------------------------------- ##### -### Load sercm interface +### Load sercmd interface # if [ -f "$MYLIBDIR/kamctl.ser" ]; then . "$MYLIBDIR/kamctl.ser" @@ -2326,13 +2353,13 @@ case $1 in trusted "$@" ;; - fifo|unixsock|ser_mi) + fifo|unixsock|ser_mi|sercmd_mi|sercmdmi) require_ctlengine shift $CTLCMD "$@" ;; - ser) + ser|sercmd) shift $SERCTLCMD "$@" ;; diff --git a/utils/kamctl/kamctl.ser b/utils/kamctl/kamctl.ser index b70deed..f84c8f0 100644 --- a/utils/kamctl/kamctl.ser +++ b/utils/kamctl/kamctl.ser @@ -23,10 +23,6 @@ fi ##### ----------------------------------------------- ##### ### parameters # -SERCMD=`which sercmd` -if [ -z "$SERCMD" ] ; then - SERCMD="/usr/local/sbin/sercmd" -fi # ##### ----------------------------------------------- ##### @@ -34,10 +30,10 @@ fi # usage_ser() { echo - mecho " -- command 'ser'" + mecho " -- command 'sercmd'" echo cat <<EOF - ser ............................... send command thru sercmd + sercmd ............................. send command through sercmd EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ser" @@ -45,10 +41,10 @@ USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ser" ser_cmd() { - mdbg "entering ser_mi_cmd $*" + mdbg "entering ser_cmd $*" if [ "$#" -lt 1 ]; then - merr "ser_cmd must take at least command name as parameter" + merr "sercmd must take at least command name as parameter" exit 1 fi diff --git a/utils/kamctl/kamctl.ser_mi b/utils/kamctl/kamctl.ser_mi index fdf247c..aad7dad 100644 --- a/utils/kamctl/kamctl.ser_mi +++ b/utils/kamctl/kamctl.ser_mi @@ -23,10 +23,6 @@ fi ##### ----------------------------------------------- ##### ### parameters # -SERCMD=`which sercmd` -if [ -z "$SERCMD" ] ; then - SERCMD="/usr/local/sbin/sercmd" -fi # ##### ----------------------------------------------- ##### @@ -34,10 +30,10 @@ fi # usage_ser_mi() { echo - mecho " -- command 'ser_mi'" + mecho " -- command 'sercmd_mi'" echo cat <<EOF - ser ............................... send mi command thru sercmd + sercmd_mi ............................. send mi command through sercmd EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ser_mi" @@ -48,7 +44,7 @@ ser_mi_cmd() mdbg "entering ser_mi_cmd $*" if [ "$#" -lt 1 ]; then - merr "ser_cmd must take at least command name as parameter" + merr "sercmd_mi must take at least command name as parameter" exit 1 fi

13 years, 8 months

git:kamailio_3.0: usrloc(k): updated index of domain column

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 40902d1e04afe5472ed2be14fa649694bef54142 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=40902d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Sep 18 11:24:20 2010 +0200 usrloc(k): updated index of domain column - index is 14 - harmless case since domain value is tested against null as well (cherry picked from commit 390eefb442f0b3b41cf5a708270ecd98765b4a66) --- modules_k/usrloc/udomain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/usrloc/udomain.c b/modules_k/usrloc/udomain.c index ce3fde3..8f21e0f 100644 --- a/modules_k/usrloc/udomain.c +++ b/modules_k/usrloc/udomain.c @@ -433,7 +433,7 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) if (use_domain) { domain = (char*)VAL_STRING(ROW_VALUES(row) + 14); - if (VAL_NULL(ROW_VALUES(row)+13) || domain==0 || domain[0]==0){ + if (VAL_NULL(ROW_VALUES(row)+14) || domain==0 || domain[0]==0){ LM_CRIT("empty domain record for user %.*s...skipping\n", user.len, user.s); continue;

13 years, 8 months

git:kamailio_3.0: db_postgres: reset row_buf for each row

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 4971831866dba88377ebe14f7032a2966acc822b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4971831… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Sep 18 11:58:21 2010 +0200 db_postgres: reset row_buf for each row - DB1 interface was reusing local buffer to convert returned rows, resulting in misusage of values from previous rows for null values - reported by Jan Klepal (cherry picked from commit 63c724b42d4c4ff45eaa660508d6358f3e894d0a) --- modules/db_postgres/km_res.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c index c4148ec..106ad22 100644 --- a/modules/db_postgres/km_res.c +++ b/modules/db_postgres/km_res.c @@ -220,7 +220,6 @@ int db_postgres_convert_rows(const db1_con_t* _h, db1_res_t* _r) return -1; } LM_DBG("allocate for %d columns %d bytes in row buffer at %p\n", RES_COL_N(_r), len, row_buf); - memset(row_buf, 0, len); if (db_allocate_rows(_r) < 0) { LM_ERR("could not allocate rows\n"); @@ -230,6 +229,8 @@ int db_postgres_convert_rows(const db1_con_t* _h, db1_res_t* _r) } for(row = RES_LAST_ROW(_r); row < (RES_LAST_ROW(_r) + RES_ROW_N(_r)); row++) { + /* reset row buf content */ + memset(row_buf, 0, len); for(col = 0; col < RES_COL_N(_r); col++) { /* * The row data pointer returned by PQgetvalue points to storage

13 years, 8 months

git:master: utils/misc: added vim syntax and auto-detect scripts

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 4e469844287808ebb02e765eee64c46724ecbf43 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e46984… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Sep 18 22:16:33 2010 +0200 utils/misc: added vim syntax and auto-detect scripts --- utils/misc/vim/README | 14 ++++++ utils/misc/vim/ftdetect/ser.vim | 21 +++++++++ utils/misc/vim/syntax/ser.vim | 91 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 0 deletions(-) diff --git a/utils/misc/vim/README b/utils/misc/vim/README new file mode 100644 index 0000000..5217f8c --- /dev/null +++ b/utils/misc/vim/README @@ -0,0 +1,14 @@ +Vim scripts to auto-detect SER and Kamailio configuration files and +enable syntax highlighting for them. + +Install: + +- copy ftdetect/ser.vim to ~/.vim/ftdetect/ser.vim +- copy syntax/ser.vim to ~/.vim/syntax/ser.vim + +Usage: + +- autodetection is based on .cfg extension and match of #!SER, +#!KAMAILIO (and other variants), modparam or route keywords in +first 400 lines of file. You can enable syntax highlighting for files +not auto-detected with vim command: "setf ser". diff --git a/utils/misc/vim/ftdetect/ser.vim b/utils/misc/vim/ftdetect/ser.vim new file mode 100644 index 0000000..478220e --- /dev/null +++ b/utils/misc/vim/ftdetect/ser.vim @@ -0,0 +1,21 @@ +" Copy this file to $HOME/.vim/ftdetect/ser.vim + +func! s:cfgType() + let max = line("$") > 400 ? 400 : line("$") + for n in range(1, max) + if getline(n) =~ '^\s*#!$KAMAILIO\|OPENSER\|SER\|ALL\|MAXCOMPAT$' + set filetype=ser + return + elseif getline(n) =~ '^\s*modparam\s*(\s*"[^"]\+"' + set filetype=ser + return + elseif getline(n) =~ '^\s*route\s*{\s*' + set filetype=ser + return + endif + endfor + setf cfg +endfunc + +au BufNewFile,BufRead *.cfg call s:cfgType() + diff --git a/utils/misc/vim/syntax/ser.vim b/utils/misc/vim/syntax/ser.vim new file mode 100644 index 0000000..e313483 --- /dev/null +++ b/utils/misc/vim/syntax/ser.vim @@ -0,0 +1,91 @@ +" -*- vim -*- +" FILE: ser.vim +" LAST MODIFICATION: 2009-05-28 18:30 +" (C) Copyright 2008 Stanisław Pitucha <viraptor(a)gmail.com> +" (C) Copyright 2009-2010 Daniel-Constantin Mierla <miconda(a)gmail.com> +" Version: 1.02 + +" USAGE: +" +" Save this file to $VIMFILES/syntax/ser.vim. Either add a detection +" script to filetypes.vim, or set filetype manually to "ser" when +" editing SIP Router configuration file with 'setf ser'. +" +" List of keyword and core functions taken from latest dev version of +" SIP Router. Module functions not included. +" +" Tested only on vim 7.1 +" +" Example: "setf ser" +" +" REQUIREMENTS: +" vim (>= 7) + +if exists("b:current_syntax") + finish +endif + +syn match serConfigParamLine '^[^=]\+=.*$' contains=serCoreParameter,serString,serConfigConstant,serSpecial,serNumber,serCppComment,serHashComment +syn region serConfigModparam start='^\s*modparam\s*(' end=')' contains=serString,serNumber +syn match serConfigModule '^\s*loadmodule\s*"[^"]\+"' contains=serString + +syn keyword serTodo TODO FIXME XXX contained + +syn match serOperator '!\|&&\|||\|=[~=]\?\|>\|<\|+\|-\|/\|\*\||\|&\|^\|\~\|defined\|eq\|ieq\|ne\|ine\|mod' display contained + +syn region serCppComment start='/\*' end='\*/' contains=serTodo +syn match serHashDefine '#!define\s\|#!ifdef\s\|#!ifndef\s\|#!endif\|#!else\|#!subst\|#!KAMAILIO\|#!OPENSER\|#!SER\|#!MAXCOMPAT\|#!ALL' +" syn match serHashDefine '^\s*#!.+$' +syn match serHashComment '#[^!].*$\|#$' contains=serTodo + +syn match serStringEscape '\\.' contained +syn match serNumber '[0-9]\+' contained +syn region serString matchgroup=Normal start='"' skip='\\"' end='"' contained contains=serVariable,serStringEscape +syn match serVariable "$[a-zA-Z_][a-zA-Z0-9_]*$([^)]\+)$\?" contained +syn match serIdentifier '[a-zA-Z_][a-zA-Z0-9_]*' contained +syn keyword serStatement route if else switch case default break exit return drop while include_file contained +syn keyword serSpecial yes no on off true false enabled disabled contained + +syn keyword serCoreKeyword af dst_ip dst_port from_uri method msg:len proto status snd_af snd_ip snd_port snd_proto src_ip src_port to_af to_ip to_port to_proto to_uri uri uri:host uri:port contained + +syn keyword serCoreValue udp UDP tcp TCP tls TLS sctp SCTP inet INET inet6 INET6 sslv23 SSLv23 SSLV23 sslv2 SSLv2 SSLV2 sslv3 SSLv3 SSLV3 tlsv1 TLSv1 TLSV1 max_len myself contained + +syn keyword serCoreFunction forward forward_tcp forward_udp forward_tls forward_sctp send send_tcp log error exec force_rport add_rport force_tcp_alias add_tcp_alias udp_mtu udp_mtu_try_proto setflag resetflag isflagset flags bool setavpflag resetavpflag isavpflagset avpflags rewritehost sethost seth rewritehostport sethostport sethp rewritehostporttrans sethostporttrans sethpt rewriteuser setuser setu rewriteuserpass setuserpass setup rewriteport setport setp rewriteuri seturi revert_uri prefix strip strip_tail userphone append_branch set_advertised_address set_advertised_port force_send_socket contained + +syn keyword serCoreParameter debug fork log_stderror log_facility listen alias auto_aliases dns rev_dns dns_try_ipv6 dns_try_naptr dns_srv_lb dns_srv_loadbalancing dns_udp_pref dns_udp_preference dns_tcp_pref dns_tcp_preference dns_tls_pref dns_tls_preference dns_sctp_pref dns_sctp_preference dns_retr_time dns_retr_no dns_servers_no dns_use_search_list dns_search_full_match dns_cache_init use_dns_cache use_dns_failover dns_cache_flags dns_cache_negative_ttl dns_cache_min_ttl dns_cache_max_ttl dns_cache_mem dns_cache_gc_interval dns_cache_del_nonexp dns_cache_delete_nonexpired dst_blacklist_init use_dst_blacklist dst_blacklist_mem dst_blacklist_expire dst_blacklist_ttl dst_blacklist_gc_interval port statistics maxbuffer children check_via phone2tel syn_branch memlog mem_log memdbg mem_dbg sip_warning server_signature reply_to_via user uid group gid chroot workdir wdir mhomed disable_tcp tcp_children tcp_accept_aliases tcp_send_timeout tcp_connect_timeout tcp_connection_lifeti me tcp_poll_method tcp_max_connections tcp_no_connect tcp_source_ipv4 tcp_source_ipv6 tcp_fd_cache tcp_buf_write tcp_async tcp_conn_wq_max tcp_wq_max tcp_rd_buf_size tcp_wq_blk_size tcp_defer_accept tcp_delayed_ack tcp_syncnt tcp_linger2 tcp_keepalive tcp_keepidle tcp_keepintvl tcp_keepcnt tcp_crlf_ping disable_tls tls_disable enable_tls tls_enable tlslog tls_log tls_port_no tls_method tls_verify tls_require_certificate tls_certificate tls_private_key tls_ca_list tls_handshake_timeout tls_send_timeout disable_sctp enable_sctp sctp_children sctp_socket_rcvbuf sctp_socket_receive_buffer sctp_socket_sndbuf sctp_socket_send_buffer sctp_autoclose sctp_send_ttl sctp_send_retries advertised_address advertised_port disable_core_dump open_files_limit shm_force_alloc mlock_pages real_time rt_prio rt_policy rt_timer1_prio rt_fast_timer_prio rt_ftimer_prio rt_timer1_policy rt_ftimer_policy rt_timer2_prio rt_stimer_prio rt_timer2_policy rt_stimer_policy mcast_loopback mcast_ttl tos pmtu_ discovery exit_timeout ser_kill_timeout max_while_loops stun_refresh_interval stun_allow_stun stun_allow_fp server_id description descr desc loadpath mpath contained + +syn region serBlock start='{' end='}' contained contains=serBlock,@serCodeElements + +syn match serRouteBlock '$failure_\|onreply_\|branch_\|event_\|onsend_$\?route$\s*\[[^\]]\+\]$\?' contained contains=serNumber,serString,serIdentifier +syn region serRrouteBlockFold matchgroup=serRouteBlock start="$failure_\|onreply_\|branch_\|event_\|onsend_$\?route$\s*\[[^\]]\+\]$\?\s*\n\?{" matchgroup=NONE end="}" contains=serBlock,@serCodeElements + +syn cluster serCodeElements contains=serHashDefine,serCppComment,serHashComment,serNumber,serString,serVariable,serOperator,serStatement,serKeyword,serCoreKeyword,serCoreValue,serCoreFunction,serIdentifier + +hi def link serCppComment Comment +hi def link serHashComment Comment +hi def link serHashDefine Special +hi def link serTodo Todo + +hi def link serConfigModparam Function +hi def link serConfigModule Keyword + +hi def link serKeyword Keyword +hi def link serCoreKeyword Special +hi def link serCoreValue Special +hi def link serCoreFunction Function +hi def link serRouteBlock Type +hi def link serRrouteBlockFold Type +hi def link serIdentifier Identifier +hi def link serSpecial Special +hi def link serCoreParameter Keyword + +hi def link serOperator Operator + +hi def link serStatement Conditional + +hi def link serNumber Number +hi def link serVariable Identifier +hi def link serString String +hi def link serStringEscape Special + +let b:current_syntax = "ser"

13 years, 8 months

git:master: kamailio.cfg: added #!ifdef LOCAL_TEST_RUN condition

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 15623c21d6c6ae933a993789453e29d610445e2c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=15623c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Sep 18 21:48:07 2010 +0200 kamailio.cfg: added #!ifdef LOCAL_TEST_RUN condition - if defined, modules are searched in source tree (e.g., start kamailio with -A LOCAL_TEST_RUN) - useful for local testing of config, imported style from ser configs --- etc/kamailio.cfg | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 0d36eeb..0e48dd4 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -164,8 +164,12 @@ pstn.gw_ip = "" desc "PSTN GW Address" ####### Modules Section ######## -#set module path +# set paths to location of modules +#!ifdef LOCAL_TEST_RUN +mpath="modules_k:modules" +#!else mpath="/usr/local/lib/kamailio/modules_k/:/usr/local/lib/kamailio/modules/" +#!endif #!ifdef WITH_MYSQL loadmodule "db_mysql.so"

13 years, 8 months

git:master: dialog(k): removed unused variable

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6f815b42c918d4360430377d632b22b8f8687e6f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f815b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Sep 18 21:23:56 2010 +0200 dialog(k): removed unused variable --- modules_k/dialog/dlg_hash.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 848ee66..8322cbb 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -1078,7 +1078,6 @@ struct mi_root * mi_terminate_dlgs(struct mi_root *cmd_tree, void *param ) struct mi_root* rpl_tree= NULL; struct dlg_cell* dlg = NULL; str headers = {0, 0}; - unsigned int i; rpl_tree = process_mi_params( cmd_tree, &dlg); if (rpl_tree)

13 years, 8 months

← Newer
1
...
8
9
10
11
12
13
14
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2010