sr-dev June 2017

sr-dev@lists.kamailio.org

28 participants
389 discussions

git:master:cde68845: modules: readme files regenerated - topoh ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: cde68845a9322f0dcd84cf13932e8cbbe6c0d544 URL: https://github.com/kamailio/kamailio/commit/cde68845a9322f0dcd84cf13932e8cb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-15T17:16:22+02:00 modules: readme files regenerated - topoh ... [skip ci] --- Modified: src/modules/topoh/README --- Diff: https://github.com/kamailio/kamailio/commit/cde68845a9322f0dcd84cf13932e8cb… Patch: https://github.com/kamailio/kamailio/commit/cde68845a9322f0dcd84cf13932e8cb… --- diff --git a/src/modules/topoh/README b/src/modules/topoh/README index 213524545c..932aa846b7 100644 --- a/src/modules/topoh/README +++ b/src/modules/topoh/README @@ -35,6 +35,10 @@ Daniel-Constantin Mierla 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 4. Event Routes + + 4.1. event_route[topoh:msg-outgoing] + List of Examples 1.1. Set mask_key parameter @@ -46,6 +50,7 @@ Daniel-Constantin Mierla 1.7. Set vparam_prefix parameter 1.8. Set callid_prefix parameter 1.9. Set sanity_checks parameter + 1.10. Usage of event_route[topoh:msg-outgoing] Chapter 1. Admin Guide @@ -69,6 +74,10 @@ Chapter 1. Admin Guide 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 4. Event Routes + + 4.1. event_route[topoh:msg-outgoing] + 1. Overview This module hides the SIP routing headers that show topology details. @@ -226,3 +235,28 @@ modparam("topoh", "callid_prefix", "***") ... modparam("topoh", "sanity_checks", 1) ... + +4. Event Routes + + 4.1. event_route[topoh:msg-outgoing] + +4.1. event_route[topoh:msg-outgoing] + + It is executed before doing topology hiding processing for an outgoing + SIP message. If 'drop' is executed inside the event route, then the + module skips doing the topology hiding. + + Inside the event route the variables $sndto(ip), $sndto(port) and + $sndto(proto) point to the destination. The SIP message is not the one + to be sent out, but an internally generated one at startup, to avoid + reparsing the outgoing SIP message for the cases when topology hiding + is not wanted. + + Example 1.10. Usage of event_route[topoh:msg-outgoing] +... +event_route[topoh:msg-outgoing] { + if($sndto(ip)=="10.1.1.10") { + drop; + } +} +...

7 years

git:master:0530de0d: topoh: documentation for event_route[topoh:msg-outgoing]

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0530de0df83e30f9d5bc544e1716a5eb22d2c39d URL: https://github.com/kamailio/kamailio/commit/0530de0df83e30f9d5bc544e1716a5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-15T17:08:55+02:00 topoh: documentation for event_route[topoh:msg-outgoing] --- Modified: src/modules/topoh/doc/topoh_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0530de0df83e30f9d5bc544e1716a5e… Patch: https://github.com/kamailio/kamailio/commit/0530de0df83e30f9d5bc544e1716a5e… --- diff --git a/src/modules/topoh/doc/topoh_admin.xml b/src/modules/topoh/doc/topoh_admin.xml index 2d92f21e47..c3366dd735 100644 --- a/src/modules/topoh/doc/topoh_admin.xml +++ b/src/modules/topoh/doc/topoh_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -253,7 +253,37 @@ modparam("topoh", "sanity_checks", 1) </programlisting> </example> </section> + </section> + <section> + <title>Event Routes</title> + <section> + <title>event_route[topoh:msg-outgoing]</title> + <para> + It is executed before doing topology hiding processing for an outgoing + SIP message. If 'drop' is executed inside the event route, then the + module skips doing the topology hiding. + </para> + <para> + Inside the event route the variables $sndto(ip), $sndto(port) and + $sndto(proto) point to the destination. The SIP message is not the one + to be sent out, but an internally generated one at startup, to avoid + reparsing the outgoing SIP message for the cases when topology hiding + is not wanted. + </para> + <example> + <title>Usage of event_route[topoh:msg-outgoing]</title> + <programlisting format="linespecific"> +... +event_route[topoh:msg-outgoing] { + if($sndto(ip)=="10.1.1.10") { + drop; + } +} +... +</programlisting> + </example> + </section> </section> </chapter>

7 years

new compiler warning

by Juha Heinanen

Today when building K 5.0 on Debian Jessie, I got this compiler warning that I don't remember seeing before: CC (gcc) [M domain.so] domain.o domain.c: In function 'w_lookup_domain': domain.c:222:5: warning: 'prefix' may be used uninitialized in this function [-Wmaybe-uninitialized] if(prefix) ^ -- Juha

7 years

git:5.0:1df7cc74: domain: fix uninitialized variable

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 1df7cc74fac83aee1d0131962ccefb81d73125e1 URL: https://github.com/kamailio/kamailio/commit/1df7cc74fac83aee1d0131962ccefb8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-15T15:56:56+02:00 domain: fix uninitialized variable - reported by Juha Heinanen --- Modified: src/modules/domain/domain.c --- Diff: https://github.com/kamailio/kamailio/commit/1df7cc74fac83aee1d0131962ccefb8… Patch: https://github.com/kamailio/kamailio/commit/1df7cc74fac83aee1d0131962ccefb8… --- diff --git a/src/modules/domain/domain.c b/src/modules/domain/domain.c index e8d75b87e9..f54ccf6185 100644 --- a/src/modules/domain/domain.c +++ b/src/modules/domain/domain.c @@ -175,7 +175,7 @@ int w_lookup_domain(struct sip_msg *_msg, char *_sp, char *_prefix) int_str name, val; struct attr_list *attrs; - str *prefix, did; + str did; unsigned short flags; str sdomain; str sprefix; @@ -219,7 +219,7 @@ int w_lookup_domain(struct sip_msg *_msg, char *_sp, char *_prefix) return -1; } LM_DBG("added AVP '%.*s'\n", name.s.len, name.s.s); - if(prefix) + if(_prefix) pkg_free(name.s.s); attrs = attrs->next; } @@ -468,4 +468,4 @@ int reload_tables(void) res = NULL; domain_db_close(); return -1; -} \ No newline at end of file +}

7 years

I&S-CSCF server not running on Ubuntu 16.04

by Prasannakumar Merugu

Hi all, I am re-sending this issue... We have installed Kamailio-5.0 in Debian-8, Configured P, I & S-CSCF servers and running successfully... and we are able to make SIP calls(Video&Audio) successfully... Now we are trying to install on Ubuntu 16.04(Kamailio-5.0) and configured P-CSCF, I-CSCF and S-CSCF severs also... P-CSCF server working fine... While running I-CSCF and S-CSCF servers we are below error and exiting... Kindly advice. I-CSCF Error logs: root@ubuntu:/usr/local/src/kamailio# kamailio -f /usr/local/etc/icscf/kamailio.cfg loading modules under config path: /usr/local/lib64/kamailio/modu les/:/usr/local/src/kamailio/src/modules/ 0(19111) ERROR: <core> [core/sr_module.c:582]: load_module(): could not open module </usr/local/lib64/kamailio/modules/cdp.so>: /usr/local/lib64/kamailio/modules/cdp.so: undefined symbol: get_str_hash S_CSCF Error logs: root@ubuntu:/usr/local/etc/icscf# kamailio -f /usr/local/etc/scscf/kamailio. cfg loading modules under config path: /usr/local/lib64/kamailio/modules/ 0(19092) ERROR: <core> [core/sr_module.c:582]: load_module(): could not open module </usr/local/lib64/kamailio/modules/cdp.so>: /usr/local/lib64/kamailio/modules/cdp.so: undefined symbol: get_str_hash

7 years

git:master:f7d1d234: topoh: execute event_route[topoh:msg-outgoing]

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f7d1d234a42198fc10e40c33e92cff5e8fc1af8e URL: https://github.com/kamailio/kamailio/commit/f7d1d234a42198fc10e40c33e92cff5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-15T07:02:59+02:00 topoh: execute event_route[topoh:msg-outgoing] - it is executed when a message is going to be sent out - if drop is used, then the message is no longer processed with topoh (it will be sent out in clear) - a faked message is provided for now to the config interpreter, but send-to info is set to the real destination, so $sndto(ip) point to real target address and can be used to decide whether to do or not topoh processing for the message - related to GH PR #1150 --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f7d1d234a42198fc10e40c33e92cff5… Patch: https://github.com/kamailio/kamailio/commit/f7d1d234a42198fc10e40c33e92cff5…

7 years

git:master:03482fb2: core: dst info attribute set for SREV_NET_DATA_OUT

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 03482fb24fb4e1057095918bc750ae713cb714ee URL: https://github.com/kamailio/kamailio/commit/03482fb24fb4e1057095918bc750ae7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-15T07:01:55+02:00 core: dst info attribute set for SREV_NET_DATA_OUT --- Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/03482fb24fb4e1057095918bc750ae7… Patch: https://github.com/kamailio/kamailio/commit/03482fb24fb4e1057095918bc750ae7… --- diff --git a/src/core/forward.h b/src/core/forward.h index deeeeb2ebe..e267f03cd1 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -137,6 +137,7 @@ static inline int msg_send_buffer(struct dest_info* dst, char* buf, int len, outb.len = len; if(!(flags&1)) { evp.data = (void*)&outb; + evp.dst = dst; sr_event_exec(SREV_NET_DATA_OUT, &evp); }

7 years

git:master:1d95163a: core: added dst info to sr_event_param_t

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1d95163aef99c4a182a802f59200eb0c324e9c71 URL: https://github.com/kamailio/kamailio/commit/1d95163aef99c4a182a802f59200eb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-15T07:01:17+02:00 core: added dst info to sr_event_param_t --- Modified: src/core/events.h --- Diff: https://github.com/kamailio/kamailio/commit/1d95163aef99c4a182a802f59200eb0… Patch: https://github.com/kamailio/kamailio/commit/1d95163aef99c4a182a802f59200eb0… --- diff --git a/src/core/events.h b/src/core/events.h index 3a753f4529..f2f63bc016 100644 --- a/src/core/events.h +++ b/src/core/events.h @@ -42,6 +42,7 @@ typedef struct sr_event_param { void *data; + dest_info_t *dst; } sr_event_param_t; typedef int (*sr_event_cb_f)(sr_event_param_t *evp);

7 years

git:master:609061e9: core: ip_addr.h - added typedefs for structures

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 609061e9c33641f847fd339dd6a1ee600f4c7fe3 URL: https://github.com/kamailio/kamailio/commit/609061e9c33641f847fd339dd6a1ee6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-14T18:31:07+02:00 core: ip_addr.h - added typedefs for structures --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/609061e9c33641f847fd339dd6a1ee6… Patch: https://github.com/kamailio/kamailio/commit/609061e9c33641f847fd339dd6a1ee6… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 4b826819e9..409716d144 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -75,6 +75,7 @@ union sockaddr_union{ struct sockaddr_in6 sin6; }; +typedef struct net sr_net_t; enum si_flags { SI_NONE=0, SI_IS_IP=1, SI_IS_LO=2, SI_IS_MCAST=4, @@ -90,6 +91,8 @@ struct addr_info{ struct addr_info* prev; }; +typedef struct addr_info addr_info_t; + struct advertise_info { str name; /* name - eg.: foo.bar or 10.0.0.1 */ unsigned short port_no; /* port number */ @@ -99,7 +102,9 @@ struct advertise_info { str sock_str; /* Socket proto, ip, and port as string */ }; -struct socket_info{ +typedef struct advertise_info advertise_info_t; + +struct socket_info { int socket; str name; /* name - eg.: foo.bar or 10.0.0.1 */ struct ip_addr address; /* ip address */ @@ -121,6 +126,7 @@ struct socket_info{ #endif /* USE_MCAST */ }; +typedef struct socket_info socket_info_t; struct receive_info{ struct ip_addr src_ip; @@ -139,6 +145,8 @@ struct receive_info{ /* no need for dst_su yet */ }; +typedef struct receive_info receive_info_t; + typedef struct sr_net_info { str data; struct dest_info* dst; @@ -155,8 +163,7 @@ struct snd_flags { unsigned char blst_imask; /* blacklist ignore mask */ }; - -typedef struct snd_flags snd_flags_t; +typedef struct snd_flags snd_flags_t; #define SND_FLAGS_INIT(sflags) \ @@ -180,7 +187,7 @@ typedef struct snd_flags snd_flags_t; }while(0) -struct dest_info{ +struct dest_info { struct socket_info* send_sock; union sockaddr_union to; int id; /* tcp stores the connection id here */ @@ -191,17 +198,20 @@ struct dest_info{ #endif }; +typedef struct dest_info dest_info_t; + /* list of names for multi-homed sockets that need to bind on * multiple addresses in the same time (sctp ) */ -struct name_lst{ +struct name_lst { char* name; struct name_lst* next; int flags; }; +typedef struct name_lst name_lst_t; -struct socket_id{ +struct socket_id { struct name_lst* addr_lst; /* address list, the first one must * be present and is the main one * (in case of multihoming sctp) */ @@ -211,6 +221,7 @@ struct socket_id{ struct socket_id* next; }; +typedef struct socket_id socket_id_t; /* len of the sockaddr */ #ifdef HAVE_SOCKADDR_SA_LEN @@ -351,7 +362,6 @@ static inline void sockaddr2ip_addr(struct ip_addr* ip, struct sockaddr* sa) } - /* compare 2 ip_addrs (both args are pointers)*/ #define ip_addr_cmp(ip1, ip2) \ (((ip1)->af==(ip2)->af)&& \ @@ -408,7 +418,6 @@ static inline void su_setport(union sockaddr_union* su, unsigned short port) } - /* inits an ip_addr pointer from a sockaddr_union ip address */ static inline void su2ip_addr(struct ip_addr* ip, union sockaddr_union* su) { @@ -749,7 +758,6 @@ static inline char* suip2a(union sockaddr_union* su, int su_len) } - /* converts an ip_addr structure to a hostent, returns pointer to internal * statical structure */ static inline struct hostent* ip_addr2he(str* name, struct ip_addr* ip)

7 years

git:master:c391cc0d: core: ip_addr.h - coherent indentation and whitespacing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c391cc0dfdf038c5258145b5ea0d0994213e44c9 URL: https://github.com/kamailio/kamailio/commit/c391cc0dfdf038c5258145b5ea0d099… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-14T18:11:28+02:00 core: ip_addr.h - coherent indentation and whitespacing --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/c391cc0dfdf038c5258145b5ea0d099… Patch: https://github.com/kamailio/kamailio/commit/c391cc0dfdf038c5258145b5ea0d099…

7 years

← Newer
1
...
19
20
21
22
23
24
25
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017