sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
439 discussions

git:master: kamctl Change "sercmd" to "kamcmd" in help texts
by Olle E. Johansson 23 Dec '12

23 Dec '12

Module: sip-router Branch: master Commit: 3eeaa5af9107f3795aee714ac47380cfb2ef45c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3eeaa5a… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 23 09:01:01 2012 +0100 kamctl Change "sercmd" to "kamcmd" in help texts --- utils/kamctl/kamctl | 4 ++-- utils/kamctl/kamctl.ser | 6 +++--- utils/kamctl/kamctl.ser_mi | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 3fecd6c..78116be 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2491,13 +2491,13 @@ case $1 in permissions_address "$@" ;; - fifo|mi|unixsock|ser_mi|sercmd_mi|sercmdmi) + fifo|mi|unixsock|ser_mi|sercmd_mi|sercmdmi|kamcmd_mi|kamcmdmi) require_ctlengine shift $CTLCMD "$@" ;; - ser|sercmd) + ser|sercmd|kamcmd) require_kamcmd shift $SERCTLCMD "$@" diff --git a/utils/kamctl/kamctl.ser b/utils/kamctl/kamctl.ser index f84c8f0..25f2264 100644 --- a/utils/kamctl/kamctl.ser +++ b/utils/kamctl/kamctl.ser @@ -30,10 +30,10 @@ fi # usage_ser() { echo - mecho " -- command 'sercmd'" + mecho " -- command 'kamcmd'" echo cat <<EOF - sercmd ............................. send command through sercmd + kamcmd ............................. send command through kamcmd EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ser" @@ -44,7 +44,7 @@ ser_cmd() mdbg "entering ser_cmd $*" if [ "$#" -lt 1 ]; then - merr "sercmd must take at least command name as parameter" + merr "kamcmd 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 ebcc61d..13f1117 100644 --- a/utils/kamctl/kamctl.ser_mi +++ b/utils/kamctl/kamctl.ser_mi @@ -30,10 +30,10 @@ fi # usage_ser_mi() { echo - mecho " -- command 'sercmd_mi'" + mecho " -- command 'kamcmd_mi'" echo cat <<EOF - sercmd_mi ............................. send mi command through sercmd + kamcmd_mi ............................. send mi command through kamcmd EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ser_mi" @@ -44,7 +44,7 @@ ser_mi_cmd() mdbg "entering ser_mi_cmd $*" if [ "$#" -lt 1 ]; then - merr "sercmd_mi must take at least command name as parameter" + merr "kamcmd_mi must take at least command name as parameter" exit 1 fi

1 0

git:master: Fixing compiler warnings
by Olle E. Johansson 23 Dec '12

23 Dec '12

Module: sip-router Branch: master Commit: 35683cfb90e68719205bef377a8bedad3e633f9d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=35683cf… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 23 08:49:23 2012 +0100 Fixing compiler warnings --- modules_k/pike/pike_rpc.c | 3 +-- modules_k/pike/pike_top.c | 2 +- modules_k/pike/pike_top.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules_k/pike/pike_rpc.c b/modules_k/pike/pike_rpc.c index 2631064..b93dcc1 100644 --- a/modules_k/pike/pike_rpc.c +++ b/modules_k/pike/pike_rpc.c @@ -138,7 +138,7 @@ static void pike_top(rpc_t *rpc, void *c) if (options == 0) { rpc->fault(c, 500, "Bad argument. Select: ALL, HOT or WARM"); - exit; + return; } @@ -196,4 +196,3 @@ rpc_export_t pike_rpc_methods[] = { {"pike.top", pike_top, pike_top_doc, 0}, {0, 0, 0, 0} }; - diff --git a/modules_k/pike/pike_top.c b/modules_k/pike/pike_top.c index 740eea3..c3d001e 100644 --- a/modules_k/pike/pike_top.c +++ b/modules_k/pike/pike_top.c @@ -45,7 +45,7 @@ static char *print_addr(unsigned char *ip, int iplen) return pike_top_print_addr(ip, iplen, buff, sizeof(buff)); } -int pike_top_add_entry( unsigned char *ip_addr, int addr_len, unsigned int leaf_hits[2], unsigned int hits[2], unsigned int expires, node_status_t status ) +int pike_top_add_entry( unsigned char *ip_addr, int addr_len, unsigned short leaf_hits[2], unsigned short hits[2], unsigned int expires, node_status_t status ) { struct TopListItem_t *new_item = (struct TopListItem_t *)malloc(sizeof(struct TopListItem_t)); diff --git a/modules_k/pike/pike_top.h b/modules_k/pike/pike_top.h index c12f201..c18c152 100644 --- a/modules_k/pike/pike_top.h +++ b/modules_k/pike/pike_top.h @@ -16,7 +16,7 @@ struct TopListItem_t { }; // returns 1 when OK and 0 when failed -int pike_top_add_entry( unsigned char *ip_addr, int iplen, unsigned int leaf_hits[2], unsigned int hits[2], unsigned int expires, node_status_t status ); +int pike_top_add_entry( unsigned char *ip_addr, int addr_len, unsigned short leaf_hits[2], unsigned short hits[2], unsigned int expires, node_status_t status ); struct TopListItem_t *pike_top_get_root(); void pike_top_list_clear();

1 0

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

23 Dec '12

Module: sip-router Branch: master Commit: 95805adb74fbc17fe38f89bf9ec8dd57f31e9d91 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95805ad… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 23 08:49:50 2012 +0100 Merge branch 'master' of ssh://git.sip-router.org/sip-router Do not read this message. It's not needed. Just a stupid swede making mistakes. Do not read this message. It's not needed. Just a stupid swede making mistakes. Do not read this message. It's not needed. Just a stupid swede making mistakes. Do not read this message. It's not needed. Just a stupid swede making mistakes. * 'master' of ssh://git.sip-router.org/sip-router: modules_s/permissions: moved to obsolete folder modules_s/textops: moved to obsolete folder textopsx: added functions that operate on header value modules_k/domain: bind_domain api function takes one param modules_k/htable: removed unused variable nathelper(k): new test 128 to check port in contact against source port modules_s/nathelper: moved to obsolete folder nathelper(k): added the select for rewriting the contact core: proper pv buffer reinitialization dialog(k): Reworked dlg_set_timeout_by_profile() code to change dialog timeouts outside of a profile lock. modules/app_lua: Updated app_lua to support URI lookup in registrar modules_k/registrar: Extended C-API to include a URI lookup pkg/kamailio/(centos|fedora): Added more modules moved from modules_s to modules to the build ---

1 0

git:oej/permissionsrpc: permissions: Adding documentation for all the new RPC functions
by Olle E. Johansson 23 Dec '12

23 Dec '12

Module: sip-router Branch: oej/permissionsrpc Commit: 1120f6ee1bdcce0bf87f97fb8c0e386bad2557e3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1120f6e… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 23 08:46:37 2012 +0100 permissions: Adding documentation for all the new RPC functions --- modules_k/permissions/README | 110 +++++++++++++++++++---- modules_k/permissions/doc/permissions_admin.xml | 91 +++++++++++++++++++ 2 files changed, 184 insertions(+), 17 deletions(-) diff --git a/modules_k/permissions/README b/modules_k/permissions/README index cf8498d..2fe117c 100644 --- a/modules_k/permissions/README +++ b/modules_k/permissions/README @@ -81,6 +81,15 @@ Juha Heinanen 5.5. trusted_dump 5.6. allow_uri + 6. RPC Commands + + 6.1. addressReload + 6.2. addressDump + 6.3. subnetDump + 6.4. testUri basename uri contact + 6.5. trustedReload + 6.6. trustedDump + List of Examples 1.1. Set default_allow_file parameter @@ -176,6 +185,15 @@ Chapter 1. Admin Guide 5.5. trusted_dump 5.6. allow_uri + 6. RPC Commands + + 6.1. addressReload + 6.2. addressDump + 6.3. subnetDump + 6.4. testUri basename uri contact + 6.5. trustedReload + 6.6. trustedDump + 1. Overview 1.1. Call Routing @@ -616,7 +634,7 @@ modparam("permissions", "peer_tag_mode", "1") 4.10. allow_address_group(addr, port) 4.11. allow_trusted([src_ip_pvar, proto_pvar]) -4.1. allow_routing() +4.1. allow_routing() Returns true if all pairs constructed as described in Section 1.1, "Call Routing" have appropriate permissions according to the @@ -632,7 +650,7 @@ if (allow_routing()) { }; ... -4.2. allow_routing(basename) +4.2. allow_routing(basename) Returns true if all pairs constructed as described in Section 1.1, "Call Routing" have appropriate permissions according to the @@ -655,7 +673,7 @@ if (allow_routing("basename")) { }; ... -4.3. allow_routing(allow_file,deny_file) +4.3. allow_routing(allow_file,deny_file) Returns true if all pairs constructed as described in Section 1.1, "Call Routing" have appropriate permissions according to the @@ -680,7 +698,7 @@ if (allow_routing("rules.allow", "rules.deny")) { }; ... -4.4. allow_register(basename) +4.4. allow_register(basename) The function returns true if all pairs constructed as described in Section 1.2, "Registration Permissions" have appropriate permissions @@ -708,7 +726,7 @@ if (method=="REGISTER") { }; ... -4.5. allow_register(allow_file, deny_file) +4.5. allow_register(allow_file, deny_file) The function returns true if all pairs constructed as described in Section 1.2, "Registration Permissions" have appropriate permissions @@ -738,7 +756,7 @@ if (method=="REGISTER") { }; ... -4.6. allow_uri(basename, pvar) +4.6. allow_uri(basename, pvar) Returns true if the pair constructed as described in Section 1.3, "URI Permissions" have appropriate permissions according to the @@ -765,7 +783,7 @@ if (allow_uri("basename", "$avp(i:705)") { // Check URI stored in $avp(i:705) }; ... -4.7. allow_address(group_id, ip_addr_pvar, port_pvar) +4.7. allow_address(group_id, ip_addr_pvar, port_pvar) Returns true if IP address and port given as values of pvar arguments belonging to a group given as group_id argument matches an IP subnet @@ -788,7 +806,7 @@ if (!allow_address("2", "$avp(i:704)", "$avp(i:705)") { }; ... -4.8. allow_source_address([group_id]) +4.8. allow_source_address([group_id]) Equal to allow_address(group_id, "$si", "$sp"). If 'group_id' is missing, the function is equal to allow_address("1", "$si", "$sp"). @@ -804,7 +822,7 @@ if (!allow_source_address("1")) { }; ... -4.9. allow_source_address_group() +4.9. allow_source_address_group() Checks if source address/port is found in cached address or subnet table in any group. If yes, returns that group. If not returns -1. Port @@ -821,7 +839,7 @@ if ($var(group) != -1) { }; ... -4.10. allow_address_group(addr, port) +4.10. allow_address_group(addr, port) Checks if address/port is found in cached address or subnet table in any group. If yes, returns that group. If not returns -1. Port value 0 @@ -839,7 +857,7 @@ if ($var(group) != -1) { }; ... -4.11. allow_trusted([src_ip_pvar, proto_pvar]) +4.11. allow_trusted([src_ip_pvar, proto_pvar]) Checks based either on request's source address and transport protocol or source address and transport protocol given in pvar arguments, and @@ -875,7 +893,7 @@ if (allow_trusted("$si", "$proto")) { 5.5. trusted_dump 5.6. allow_uri -5.1. address_reload +5.1. address_reload Causes permissions module to re-read the contents of address database table into cache memory. In cache memory the entries are for @@ -884,35 +902,79 @@ if (allow_trusted("$si", "$proto")) { Parameters: none -5.2. address_dump +5.2. address_dump Causes permissions module to dump contents of cache memory address table. Parameters: none -5.3. subnet_dump +5.3. subnet_dump Causes permissions module to dump contents of cache memory subnet table. Parameters: none -5.4. trusted_reload +5.4. trusted_reload Causes permissions module to re-read the contents of trusted table into cache memory. Parameters: none -5.5. trusted_dump +5.5. trusted_dump Causes permissions module to dump contents of trusted table from cache memory. Parameters: none -5.6. allow_uri +5.6. allow_uri + + Tests if (URI, Contact) pair is allowed according to allow/deny files. + The files must already have been loaded by Kamailio. + + Parameters: + * basename - Basename from which allow and deny filenames will be + created by appending contents of allow_suffix and deny_suffix + parameters. + * URI - URI to be tested + * Contact - Contact to be tested + +6. RPC Commands + + 6.1. addressReload + 6.2. addressDump + 6.3. subnetDump + 6.4. testUri basename uri contact + 6.5. trustedReload + 6.6. trustedDump + +6.1. addressReload + + Causes permissions module to re-read the contents of address database + table into cache memory. In cache memory the entries are for + performance reasons stored in two different tables: address table and + subnet table depending on the value of the mask field (32 or smaller). + + Parameters: none + +6.2. addressDump + + Causes permissions module to dump contents of cache memory address + table. (Not the subnet table). + + Parameters: none + +6.3. subnetDump + + Causes permissions module to dump contents of cache memory subnet + table. + + Parameters: none + +6.4. testUri basename uri contact Tests if (URI, Contact) pair is allowed according to allow/deny files. The files must already have been loaded by Kamailio. @@ -923,3 +985,17 @@ if (allow_trusted("$si", "$proto")) { parameters. * URI - URI to be tested * Contact - Contact to be tested + +6.5. trustedReload + + Causes permissions module to re-read the contents of trusted table into + cache memory. + + Parameters: none + +6.6. trustedDump + + Causes permissions module to dump contents of trusted table from cache + memory. + + Parameters: none diff --git a/modules_k/permissions/doc/permissions_admin.xml b/modules_k/permissions/doc/permissions_admin.xml index 5788dfb..216203a 100644 --- a/modules_k/permissions/doc/permissions_admin.xml +++ b/modules_k/permissions/doc/permissions_admin.xml @@ -1187,6 +1187,97 @@ if (allow_trusted("$si", "$proto")) { </section> </section> + <section> + <title>RPC Commands</title> + <section> + <title> + <function moreinfo="none">addressReload</function> + </title> + <para> + Causes permissions module to re-read the contents of + address database table into cache + memory. In cache memory the entries are + for performance reasons stored in two + different tables: address table and + subnet table depending on the value of + the mask field (32 or smaller). + + </para> + <para>Parameters: <emphasis>none</emphasis></para> + </section> + + <section> + <title> + <function moreinfo="none">addressDump</function> + </title> + <para> + Causes permissions module to dump + contents of cache memory address table. + (Not the subnet table). + + </para> + <para>Parameters: <emphasis>none</emphasis></para> + </section> + + <section> + <title> + <function moreinfo="none">subnetDump</function> + </title> + <para> + Causes permissions module to dump + contents of cache memory subnet table. + </para> + <para>Parameters: <emphasis>none</emphasis></para> + </section> + <section> + <title> + <function moreinfo="none">testUri basename uri contact</function> + </title> + <para> + Tests if (URI, Contact) pair is allowed according to + allow/deny files. The files must already have been + loaded by &kamailio;. + </para> + <para>Parameters: </para> + <itemizedlist> + <listitem><para> + <emphasis>basename</emphasis> - + Basename from which allow and deny filenames will be created by + appending contents of allow_suffix and deny_suffix + parameters. + </para></listitem> + <listitem><para> + <emphasis>URI</emphasis> - URI to be tested + </para></listitem> + <listitem><para> + <emphasis>Contact</emphasis> - Contact to be tested + </para></listitem> + </itemizedlist> + + </section> + + <section> + <title> + <function moreinfo="none">trustedReload</function> + </title> + <para> + Causes permissions module to re-read the contents of + trusted table into cache memory. + </para> + <para>Parameters: <emphasis>none</emphasis></para> + </section> + <section> + <title> + <function moreinfo="none">trustedDump</function> + </title> + <para> + Causes permissions module to dump contents of trusted + table from cache memory. + </para> + <para>Parameters: <emphasis>none</emphasis></para> + </section> + + </section>  </chapter>

1 0

git:oej/permissionsrpc: permissions: Add rpc testUri funcion
by Olle E. Johansson 23 Dec '12

23 Dec '12

Module: sip-router Branch: oej/permissionsrpc Commit: 806a3375debbd2f04578c71d38c39dcc66df32e3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=806a337… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 23 08:32:00 2012 +0100 permissions: Add rpc testUri funcion ...the problem is that it doesn't work. rpc->scan doesn't properly set the length of the string... --- modules_k/permissions/mi.c | 56 ++++++++++++++++++++++++++++++++++- modules_k/permissions/mi.h | 1 + modules_k/permissions/permissions.c | 8 ++++- 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/modules_k/permissions/mi.c b/modules_k/permissions/mi.c index eed980b..c86388e 100644 --- a/modules_k/permissions/mi.c +++ b/modules_k/permissions/mi.c @@ -198,7 +198,7 @@ void rpc_subnet_dump(rpc_t* rpc, void* c) { #define MAX_FILE_LEN 128 -/* +/*! \brief * MI function to make allow_uri query. */ struct mi_root* mi_allow_uri(struct mi_root *cmd, void *param) @@ -249,3 +249,57 @@ struct mi_root* mi_allow_uri(struct mi_root *cmd, void *param) return init_mi_tree(403, MI_SSTR("Forbidden")); } } + +/*! \brief + * RPC function to make allow_uri query. + */ +void rpc_test_uri(rpc_t* rpc, void* c) +{ + str *basenamep, *urip, *contactp; + char basename[MAX_FILE_LEN + 1]; + char uri[MAX_URI_SIZE + 1], contact[MAX_URI_SIZE + 1]; + unsigned int allow_suffix_len; + int i; + + if (rpc->scan(c, ".S", &basenamep) != 1) { + rpc->fault(c, 500, "Not enough parameters (basename, URI and contact)"); + return; + } + //LM_DBG("Basename %s length %d \n", basenamep, basenamep->len); + if (rpc->scan(c, ".S", &urip) != 1) { + rpc->fault(c, 500, "Not enough parameters (basename, URI and contact)"); + return; + } + //LM_DBG("URI %s length %d \n", urip, urip->len); + if (rpc->scan(c, ".S", &contactp) != 1) { + rpc->fault(c, 500, "Not enough parameters (basename, URI and contact)"); + return; + } + //LM_DBG("Contact %s length %d size %d\n", contactp, contactp->len, sizeof(contactp->s) - 1); + + /* For some reason, rtp->scan doesn't set the length properly */ + if (contactp->len > MAX_URI_SIZE) { + rpc->fault(c, 500, "Contact is too long"); + return; + } + allow_suffix_len = strlen(allow_suffix); + if (basenamep->len + allow_suffix_len + 1 > MAX_FILE_LEN) { + rpc->fault(c, 500, "Basename is too long"); + return; + } + + memcpy(basename, basenamep->s, basenamep->len); + memcpy(basename + basenamep->len, allow_suffix, allow_suffix_len); + basename[basenamep->len + allow_suffix_len] = 0; + memcpy(uri, urip->s, urip->len); + memcpy(contact, contactp->s, contactp->len); + contact[contactp->len] = 0; + uri[urip->len] = 0; + + if (allow_test(basename, uri, contact) == 1) { + rpc->printf(c, "Allowed"); + return; + } + rpc->printf(c, "Denied"); + return; +} diff --git a/modules_k/permissions/mi.h b/modules_k/permissions/mi.h index c490b0a..09f3897 100644 --- a/modules_k/permissions/mi.h +++ b/modules_k/permissions/mi.h @@ -55,5 +55,6 @@ struct mi_root* mi_subnet_dump(struct mi_root *cmd_tree, void *param); void rpc_subnet_dump(rpc_t* rpc, void* c); struct mi_root* mi_allow_uri(struct mi_root *cmd, void *param); +void rpc_test_uri(rpc_t* rpc, void* c); #endif diff --git a/modules_k/permissions/permissions.c b/modules_k/permissions/permissions.c index 37d7b17..2b7a279 100644 --- a/modules_k/permissions/permissions.c +++ b/modules_k/permissions/permissions.c @@ -455,7 +455,7 @@ static int load_fixup(void** param, int param_no) if (table[rules_num].rules) { LM_DBG("file (%s) parsed\n", pathname); } else { - LM_INFO("file (%s) not found => empty rule set\n", pathname); + LM_INFO("file (%s) not parsed properly => empty rule set\n", pathname); } *param = (void*)(long)rules_num; if (param_no == 2) rules_num++; @@ -1009,12 +1009,18 @@ static const char* rpc_subnet_dump_doc[2] = { 0 }; +static const char* rpc_test_uri_doc[2] = { + "Tests if (URI, Contact) pair is allowed according to allow/deny files", + 0 +}; + rpc_export_t permissions_rpc[] = { {"permissions.trustedReload", rpc_trusted_reload, rpc_trusted_reload_doc, 0}, {"permissions.addressReload", rpc_address_reload, rpc_address_reload_doc, 0}, {"permissions.trustedDump", rpc_trusted_dump, rpc_trusted_dump_doc, 0}, {"permissions.addressDump", rpc_address_dump, rpc_address_dump_doc, 0}, {"permissions.subnetDump", rpc_subnet_dump, rpc_subnet_dump_doc, 0}, + {"permissions.testUri", rpc_test_uri, rpc_test_uri_doc, 0}, {0, 0, 0, 0} };

1 0

git:oej/permissionsrpc: permissions Adding RPC commands for dumping addresses and subnets
by Olle E. Johansson 23 Dec '12

23 Dec '12

Module: sip-router Branch: oej/permissionsrpc Commit: 534a580a6e9bf98debb3dfb8c5b9d433d997f52e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=534a580… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Dec 22 21:53:34 2012 +0100 permissions Adding RPC commands for dumping addresses and subnets --- modules_k/permissions/hash.c | 144 +++++++++++++++++++++++++++++++++- modules_k/permissions/hash.h | 4 + modules_k/permissions/mi.c | 58 ++++++++++++-- modules_k/permissions/mi.h | 3 + modules_k/permissions/permissions.c | 22 +++++- modules_k/permissions/trusted.c | 13 ++- 6 files changed, 224 insertions(+), 20 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=534…

1 0

git:pd/outbound: Merge branch 'master' into outbound
by Peter Dunkley 22 Dec '12

22 Dec '12

Module: sip-router Branch: pd/outbound Commit: b6b3acf9e2cf3283684773df325eb8ac6d2226c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6b3acf… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Dec 22 17:03:25 2012 +0000 Merge branch 'master' into outbound * master: modules_s/permissions: moved to obsolete folder modules_s/textops: moved to obsolete folder textopsx: added functions that operate on header value ---

1 0

git:pd/outbound: modules_k/outbound: Improved flow token encode/decode. Now should work properly with IPv4 and IPv6
by Peter Dunkley 22 Dec '12

22 Dec '12

Module: sip-router Branch: pd/outbound Commit: 0c3d25f4fba43ee66a6f1edf88b1abfde97668c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c3d25f… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Dec 22 17:02:01 2012 +0000 modules_k/outbound: Improved flow token encode/decode. Now should work properly with IPv4 and IPv6 --- modules_k/outbound/ob_mod.c | 68 ++++++++++++++++++++++++++----------------- 1 files changed, 41 insertions(+), 27 deletions(-) diff --git a/modules_k/outbound/ob_mod.c b/modules_k/outbound/ob_mod.c index 63e922f..59c02f3 100644 --- a/modules_k/outbound/ob_mod.c +++ b/modules_k/outbound/ob_mod.c @@ -96,20 +96,23 @@ static int mod_init(void) <HMAC-SHA1-80><protocol><dst_ip><dst_port><src_ip><src_port> 10 + 1 + 16 + 2 + 16 + 2 - = 47 bytes + = 47 bytes maximum - IP addresses will always be 16 bytes. When an IPv4 address is used the - address will be encoded in the first four bytes and the last four bytes will - be ignored. + <protocol> specifies whether the addresses are IPv4 or IPv6 and the + transport. + Bits 0-6: transport (see sip_protos enum from ip_addr.h) + Bit 7: IPv6 if set, IPv4 if unset - base64 encoded size: ceiling((47+2)/3)*4 = 68 bytes + IP addresses will be 4 (for IPv6) or 16 (for IPv6) bytes. + + Maximum base64 encoded size: ceiling((47+2)/3)*4 = 68 bytes */ -#define UNENC_FLOW_TOKEN_LENGTH 47 -#define SHA1_LENGTH 20 -#define SHA1_80_LENGTH 10 -#define FLOW_TOKEN_START_POS (SHA1_80_LENGTH) -static unsigned char unenc_flow_token[UNENC_FLOW_TOKEN_LENGTH]; +#define UNENC_FLOW_TOKEN_MAX_LENGTH 47 +#define SHA1_LENGTH 20 +#define SHA1_80_LENGTH 10 +#define FLOW_TOKEN_START_POS (SHA1_80_LENGTH) +static unsigned char unenc_flow_token[UNENC_FLOW_TOKEN_MAX_LENGTH]; static unsigned char hmac_sha1[EVP_MAX_MD_SIZE]; int encode_flow_token(str *flow_token, struct receive_info rcv) @@ -123,16 +126,17 @@ int encode_flow_token(str *flow_token, struct receive_info rcv) } /* Encode protocol information */ - unenc_flow_token[pos++] = rcv.proto; + unenc_flow_token[pos++] = + (rcv.dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv.proto; /* Encode destination address */ - for (i = 0; i < 16; i++) + for (i = 0; i < (rcv.dst_ip.af == AF_INET6 ? 16 : 4); i++) unenc_flow_token[pos++] = rcv.dst_ip.u.addr[i]; unenc_flow_token[pos++] = (rcv.dst_port >> 8) & 0xff; unenc_flow_token[pos++] = rcv.dst_port & 0xff; /* Encode source address */ - for (i = 0; i < 16; i++) + for (i = 0; i < (rcv.src_ip.af == AF_INET6 ? 16 : 4); i++) unenc_flow_token[pos++] = rcv.src_ip.u.addr[i]; unenc_flow_token[pos++] = (rcv.dst_port >> 8) & 0xff; unenc_flow_token[pos++] = rcv.dst_port & 0xff; @@ -141,46 +145,46 @@ int encode_flow_token(str *flow_token, struct receive_info rcv) prepend onto the flow token */ HMAC(EVP_sha1(), ob_key.s, ob_key.len, &unenc_flow_token[FLOW_TOKEN_START_POS], - UNENC_FLOW_TOKEN_LENGTH - FLOW_TOKEN_START_POS, + pos - FLOW_TOKEN_START_POS, hmac_sha1, NULL); memcpy(unenc_flow_token, &hmac_sha1[SHA1_LENGTH - SHA1_80_LENGTH], SHA1_80_LENGTH); /* base64 encode the entire flow token and store for the caller to use */ - flow_token->s = pkg_malloc(base64_enc_len(UNENC_FLOW_TOKEN_LENGTH)); + flow_token->s = pkg_malloc(base64_enc_len(pos)); if (flow_token->s == NULL) { LM_ERR("allocating package memory\n"); return -1; } - flow_token->len = base64_enc(unenc_flow_token, UNENC_FLOW_TOKEN_LENGTH, + flow_token->len = base64_enc(unenc_flow_token, pos, (unsigned char *) flow_token->s, - base64_enc_len(UNENC_FLOW_TOKEN_LENGTH)); + base64_enc_len(pos)); return 0; } int decode_flow_token(struct receive_info *rcv, str flow_token) { - int pos = FLOW_TOKEN_START_POS, i; + int pos = FLOW_TOKEN_START_POS, flow_length, i; - if (flow_token.len != base64_enc_len(UNENC_FLOW_TOKEN_LENGTH)) + if (flow_token.len > base64_enc_len(UNENC_FLOW_TOKEN_MAX_LENGTH)) { - LM_ERR("bad flow token length. Length is %d, expected %d\n", - flow_token.len, UNENC_FLOW_TOKEN_LENGTH); + LM_ERR("bad flow token length. Length is %d, expected <= %d\n", + flow_token.len, UNENC_FLOW_TOKEN_MAX_LENGTH); return -1; } /* base64 decode the flow token */ - base64_dec((unsigned char *) flow_token.s, flow_token.len, - unenc_flow_token, UNENC_FLOW_TOKEN_LENGTH); + flow_length = base64_dec((unsigned char *) flow_token.s, flow_token.len, + unenc_flow_token, UNENC_FLOW_TOKEN_MAX_LENGTH); /* HMAC-SHA1 the flow token (after the hash) and compare with the truncated hash at the start of the flow token. */ HMAC(EVP_sha1(), ob_key.s, ob_key.len, &unenc_flow_token[FLOW_TOKEN_START_POS], - UNENC_FLOW_TOKEN_LENGTH - FLOW_TOKEN_START_POS, + flow_length - FLOW_TOKEN_START_POS, hmac_sha1, NULL); if (memcmp(unenc_flow_token, &hmac_sha1[SHA1_LENGTH - SHA1_80_LENGTH], SHA1_80_LENGTH) != 0) @@ -190,16 +194,26 @@ int decode_flow_token(struct receive_info *rcv, str flow_token) } /* Decode protocol information */ - rcv->proto = unenc_flow_token[pos++]; + if (unenc_flow_token[pos] & 0x80) + { + rcv->dst_ip.af = rcv->src_ip.af = AF_INET6; + rcv->dst_ip.len = rcv->src_ip.len = 16; + } + else + { + rcv->dst_ip.af = rcv->src_ip.af = AF_INET; + rcv->dst_ip.len = rcv->src_ip.len = 4; + } + rcv->proto = unenc_flow_token[pos++] & 0x7f; /* Decode destination address */ - for (i = 0; i < 16; i++) + for (i = 0; i < (rcv->dst_ip.af == AF_INET6 ? 16 : 4); i++) rcv->dst_ip.u.addr[i] = unenc_flow_token[pos++]; rcv->dst_port = ((unenc_flow_token[pos++] << 8) & 0xff) | (unenc_flow_token[pos++] & 0xff); /* Decode source address */ - for (i = 0; i < 16; i++) + for (i = 0; i < (rcv->src_ip.af == AF_INET6 ? 16 : 4); i++) rcv->src_ip.u.addr[i] = unenc_flow_token[pos++]; rcv->src_port = ((unenc_flow_token[pos++] << 8) & 0xff) | (unenc_flow_token[pos++] & 0xff);

1 0

patch proposal
by Konstantin M. 22 Dec '12

22 Dec '12

Hello, Here is proposed patch for adding calloc to pkg_ memory manager.

2 1

git:master: modules_s/permissions: moved to obsolete folder
by Daniel-Constantin Mierla 22 Dec '12

22 Dec '12

Module: sip-router Branch: master Commit: 9b2cb40fdb0660b61e9d9bb2086100c54ac7066e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b2cb40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 22 14:29:55 2012 +0100 modules_s/permissions: moved to obsolete folder - use the other module with same name --- {modules_s => obsolete}/permissions/Makefile | 0 {modules_s => obsolete}/permissions/README | 0 {modules_s => obsolete}/permissions/allow_files.c | 0 {modules_s => obsolete}/permissions/allow_files.h | 0 .../permissions/config/permissions.allow | 0 .../permissions/config/permissions.deny | 0 .../permissions/config/register.allow | 0 .../permissions/config/register.deny | 0 {modules_s => obsolete}/permissions/doc/Makefile | 0 .../permissions/doc/functions.xml | 0 {modules_s => obsolete}/permissions/doc/params.xml | 0 .../permissions/doc/permissions.xml | 0 {modules_s => obsolete}/permissions/doc/xmlrpc.xml | 0 {modules_s => obsolete}/permissions/im_db.c | 0 {modules_s => obsolete}/permissions/im_db.h | 0 {modules_s => obsolete}/permissions/im_hash.c | 0 {modules_s => obsolete}/permissions/im_hash.h | 0 {modules_s => obsolete}/permissions/im_locks.c | 0 {modules_s => obsolete}/permissions/im_locks.h | 0 {modules_s => obsolete}/permissions/im_rpc.c | 0 {modules_s => obsolete}/permissions/im_rpc.h | 0 {modules_s => obsolete}/permissions/ip_set.c | 0 {modules_s => obsolete}/permissions/ip_set.h | 0 {modules_s => obsolete}/permissions/ip_set_rpc.c | 0 {modules_s => obsolete}/permissions/ip_set_rpc.h | 0 {modules_s => obsolete}/permissions/ip_tree.c | 0 {modules_s => obsolete}/permissions/ip_tree.h | 0 {modules_s => obsolete}/permissions/ipmatch.c | 0 {modules_s => obsolete}/permissions/ipmatch.h | 0 {modules_s => obsolete}/permissions/parse_config.c | 0 {modules_s => obsolete}/permissions/parse_config.h | 0 {modules_s => obsolete}/permissions/permissions.c | 0 {modules_s => obsolete}/permissions/permissions.h | 0 .../permissions/permissions_rpc.h | 0 {modules_s => obsolete}/permissions/rule.c | 0 {modules_s => obsolete}/permissions/rule.h | 0 {modules_s => obsolete}/permissions/trusted.c | 0 {modules_s => obsolete}/permissions/trusted.h | 0 {modules_s => obsolete}/permissions/trusted_hash.c | 0 {modules_s => obsolete}/permissions/trusted_hash.h | 0 {modules_s => obsolete}/permissions/trusted_rpc.c | 0 {modules_s => obsolete}/permissions/trusted_rpc.h | 0 42 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_s/permissions/Makefile b/obsolete/permissions/Makefile similarity index 100% rename from modules_s/permissions/Makefile rename to obsolete/permissions/Makefile diff --git a/modules_s/permissions/README b/obsolete/permissions/README similarity index 100% rename from modules_s/permissions/README rename to obsolete/permissions/README diff --git a/modules_s/permissions/allow_files.c b/obsolete/permissions/allow_files.c similarity index 100% rename from modules_s/permissions/allow_files.c rename to obsolete/permissions/allow_files.c diff --git a/modules_s/permissions/allow_files.h b/obsolete/permissions/allow_files.h similarity index 100% rename from modules_s/permissions/allow_files.h rename to obsolete/permissions/allow_files.h diff --git a/modules_s/permissions/config/permissions.allow b/obsolete/permissions/config/permissions.allow similarity index 100% rename from modules_s/permissions/config/permissions.allow rename to obsolete/permissions/config/permissions.allow diff --git a/modules_s/permissions/config/permissions.deny b/obsolete/permissions/config/permissions.deny similarity index 100% rename from modules_s/permissions/config/permissions.deny rename to obsolete/permissions/config/permissions.deny diff --git a/modules_s/permissions/config/register.allow b/obsolete/permissions/config/register.allow similarity index 100% rename from modules_s/permissions/config/register.allow rename to obsolete/permissions/config/register.allow diff --git a/modules_s/permissions/config/register.deny b/obsolete/permissions/config/register.deny similarity index 100% rename from modules_s/permissions/config/register.deny rename to obsolete/permissions/config/register.deny diff --git a/modules_s/permissions/doc/Makefile b/obsolete/permissions/doc/Makefile similarity index 100% rename from modules_s/permissions/doc/Makefile rename to obsolete/permissions/doc/Makefile diff --git a/modules_s/permissions/doc/functions.xml b/obsolete/permissions/doc/functions.xml similarity index 100% rename from modules_s/permissions/doc/functions.xml rename to obsolete/permissions/doc/functions.xml diff --git a/modules_s/permissions/doc/params.xml b/obsolete/permissions/doc/params.xml similarity index 100% rename from modules_s/permissions/doc/params.xml rename to obsolete/permissions/doc/params.xml diff --git a/modules_s/permissions/doc/permissions.xml b/obsolete/permissions/doc/permissions.xml similarity index 100% rename from modules_s/permissions/doc/permissions.xml rename to obsolete/permissions/doc/permissions.xml diff --git a/modules_s/permissions/doc/xmlrpc.xml b/obsolete/permissions/doc/xmlrpc.xml similarity index 100% rename from modules_s/permissions/doc/xmlrpc.xml rename to obsolete/permissions/doc/xmlrpc.xml diff --git a/modules_s/permissions/im_db.c b/obsolete/permissions/im_db.c similarity index 100% rename from modules_s/permissions/im_db.c rename to obsolete/permissions/im_db.c diff --git a/modules_s/permissions/im_db.h b/obsolete/permissions/im_db.h similarity index 100% rename from modules_s/permissions/im_db.h rename to obsolete/permissions/im_db.h diff --git a/modules_s/permissions/im_hash.c b/obsolete/permissions/im_hash.c similarity index 100% rename from modules_s/permissions/im_hash.c rename to obsolete/permissions/im_hash.c diff --git a/modules_s/permissions/im_hash.h b/obsolete/permissions/im_hash.h similarity index 100% rename from modules_s/permissions/im_hash.h rename to obsolete/permissions/im_hash.h diff --git a/modules_s/permissions/im_locks.c b/obsolete/permissions/im_locks.c similarity index 100% rename from modules_s/permissions/im_locks.c rename to obsolete/permissions/im_locks.c diff --git a/modules_s/permissions/im_locks.h b/obsolete/permissions/im_locks.h similarity index 100% rename from modules_s/permissions/im_locks.h rename to obsolete/permissions/im_locks.h diff --git a/modules_s/permissions/im_rpc.c b/obsolete/permissions/im_rpc.c similarity index 100% rename from modules_s/permissions/im_rpc.c rename to obsolete/permissions/im_rpc.c diff --git a/modules_s/permissions/im_rpc.h b/obsolete/permissions/im_rpc.h similarity index 100% rename from modules_s/permissions/im_rpc.h rename to obsolete/permissions/im_rpc.h diff --git a/modules_s/permissions/ip_set.c b/obsolete/permissions/ip_set.c similarity index 100% rename from modules_s/permissions/ip_set.c rename to obsolete/permissions/ip_set.c diff --git a/modules_s/permissions/ip_set.h b/obsolete/permissions/ip_set.h similarity index 100% rename from modules_s/permissions/ip_set.h rename to obsolete/permissions/ip_set.h diff --git a/modules_s/permissions/ip_set_rpc.c b/obsolete/permissions/ip_set_rpc.c similarity index 100% rename from modules_s/permissions/ip_set_rpc.c rename to obsolete/permissions/ip_set_rpc.c diff --git a/modules_s/permissions/ip_set_rpc.h b/obsolete/permissions/ip_set_rpc.h similarity index 100% rename from modules_s/permissions/ip_set_rpc.h rename to obsolete/permissions/ip_set_rpc.h diff --git a/modules_s/permissions/ip_tree.c b/obsolete/permissions/ip_tree.c similarity index 100% rename from modules_s/permissions/ip_tree.c rename to obsolete/permissions/ip_tree.c diff --git a/modules_s/permissions/ip_tree.h b/obsolete/permissions/ip_tree.h similarity index 100% rename from modules_s/permissions/ip_tree.h rename to obsolete/permissions/ip_tree.h diff --git a/modules_s/permissions/ipmatch.c b/obsolete/permissions/ipmatch.c similarity index 100% rename from modules_s/permissions/ipmatch.c rename to obsolete/permissions/ipmatch.c diff --git a/modules_s/permissions/ipmatch.h b/obsolete/permissions/ipmatch.h similarity index 100% rename from modules_s/permissions/ipmatch.h rename to obsolete/permissions/ipmatch.h diff --git a/modules_s/permissions/parse_config.c b/obsolete/permissions/parse_config.c similarity index 100% rename from modules_s/permissions/parse_config.c rename to obsolete/permissions/parse_config.c diff --git a/modules_s/permissions/parse_config.h b/obsolete/permissions/parse_config.h similarity index 100% rename from modules_s/permissions/parse_config.h rename to obsolete/permissions/parse_config.h diff --git a/modules_s/permissions/permissions.c b/obsolete/permissions/permissions.c similarity index 100% rename from modules_s/permissions/permissions.c rename to obsolete/permissions/permissions.c diff --git a/modules_s/permissions/permissions.h b/obsolete/permissions/permissions.h similarity index 100% rename from modules_s/permissions/permissions.h rename to obsolete/permissions/permissions.h diff --git a/modules_s/permissions/permissions_rpc.h b/obsolete/permissions/permissions_rpc.h similarity index 100% rename from modules_s/permissions/permissions_rpc.h rename to obsolete/permissions/permissions_rpc.h diff --git a/modules_s/permissions/rule.c b/obsolete/permissions/rule.c similarity index 100% rename from modules_s/permissions/rule.c rename to obsolete/permissions/rule.c diff --git a/modules_s/permissions/rule.h b/obsolete/permissions/rule.h similarity index 100% rename from modules_s/permissions/rule.h rename to obsolete/permissions/rule.h diff --git a/modules_s/permissions/trusted.c b/obsolete/permissions/trusted.c similarity index 100% rename from modules_s/permissions/trusted.c rename to obsolete/permissions/trusted.c diff --git a/modules_s/permissions/trusted.h b/obsolete/permissions/trusted.h similarity index 100% rename from modules_s/permissions/trusted.h rename to obsolete/permissions/trusted.h diff --git a/modules_s/permissions/trusted_hash.c b/obsolete/permissions/trusted_hash.c similarity index 100% rename from modules_s/permissions/trusted_hash.c rename to obsolete/permissions/trusted_hash.c diff --git a/modules_s/permissions/trusted_hash.h b/obsolete/permissions/trusted_hash.h similarity index 100% rename from modules_s/permissions/trusted_hash.h rename to obsolete/permissions/trusted_hash.h diff --git a/modules_s/permissions/trusted_rpc.c b/obsolete/permissions/trusted_rpc.c similarity index 100% rename from modules_s/permissions/trusted_rpc.c rename to obsolete/permissions/trusted_rpc.c diff --git a/modules_s/permissions/trusted_rpc.h b/obsolete/permissions/trusted_rpc.h similarity index 100% rename from modules_s/permissions/trusted_rpc.h rename to obsolete/permissions/trusted_rpc.h

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
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