sr-dev February 2012

sr-dev@lists.kamailio.org

24 participants
116 discussions

git:master: Added config function send_dmq message which exposes the same functionality as the API function .
by Marius Ovidiu Bucur 02 Feb '12

02 Feb '12

Module: sip-router Branch: master Commit: ca6b59ee93096fcff4aa7d7798c79b27aa749158 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca6b59e… Author: Marius Bucur <marius.bucur(a)1and1.ro> Committer: Marius Bucur <marius.bucur(a)1and1.ro> Date: Thu Feb 2 15:25:23 2012 +0200 Added config function send_dmq message which exposes the same functionality as the API function. --- modules_k/dmq/dmq.c | 9 +++++++-- modules_k/dmq/dmq_funcs.c | 40 ++++++++++++++++++++++++++++++++++++++++ modules_k/dmq/dmq_funcs.h | 1 + modules_k/dmq/peer.c | 3 +++ modules_k/dmq/peer.h | 2 +- 5 files changed, 52 insertions(+), 3 deletions(-) diff --git a/modules_k/dmq/dmq.c b/modules_k/dmq/dmq.c index 7a62302..62fa6e6 100644 --- a/modules_k/dmq/dmq.c +++ b/modules_k/dmq/dmq.c @@ -93,11 +93,14 @@ static int mod_init(void); static int child_init(int); static void destroy(void); static int handle_dmq_fixup(void** param, int param_no); +static int send_dmq_fixup(void** param, int param_no); static int parse_server_address(str* uri, struct sip_uri* parsed_uri); static cmd_export_t cmds[] = { {"handle_dmq_message", (cmd_function)handle_dmq_message, 0, handle_dmq_fixup, 0, REQUEST_ROUTE}, + {"send_dmq_message", (cmd_function)cfg_send_dmq_message, 3, send_dmq_fixup, 0, + ANY_ROUTE}, {"bind_dmq", (cmd_function)bind_dmq, 0, 0, 0, REQUEST_ROUTE}, {0, 0, 0, 0, 0, 0} @@ -262,14 +265,16 @@ static int handle_dmq_fixup(void** param, int param_no) { return 0; } +static int send_dmq_fixup(void** param, int param_no) { + return fixup_spve_null(param, 1); +} + static int parse_server_address(str* uri, struct sip_uri* parsed_uri) { if(!uri->s) { - LM_ERR("server address missing\n"); goto empty; } uri->len = strlen(uri->s); if(!uri->len) { - LM_ERR("empty server address\n"); goto empty; } if(parse_uri(uri->s, uri->len, parsed_uri) < 0) { diff --git a/modules_k/dmq/dmq_funcs.c b/modules_k/dmq/dmq_funcs.c index a71da87..988563a 100644 --- a/modules_k/dmq/dmq_funcs.c +++ b/modules_k/dmq/dmq_funcs.c @@ -149,6 +149,46 @@ error: return -1; } +int cfg_send_dmq_message(struct sip_msg* msg, char* peer, char* to, char* body) { + str peer_str; + get_str_fparam(&peer_str, msg, (fparam_t*)peer); + str to_str; + get_str_fparam(&to_str, msg, (fparam_t*)to); + str body_str; + get_str_fparam(&body_str, msg, (fparam_t*)body); + LM_INFO("cfg_send_dmq_message: %.*s - %.*s - %.*s\n", + peer_str.len, peer_str.s, + to_str.len, to_str.s, + body_str.len, body_str.s); + + dmq_peer_t* destination_peer = find_peer(peer_str); + if(!destination_peer) { + LM_INFO("cannot find peer %.*s\n", peer_str.len, peer_str.s); + dmq_peer_t new_peer; + new_peer.callback = empty_peer_callback; + new_peer.description.s = ""; + new_peer.description.len = 0; + new_peer.peer_id = peer_str; + destination_peer = register_dmq_peer(&new_peer); + if(!destination_peer) { + LM_ERR("error in register_dmq_peer\n"); + goto error; + } + } + dmq_node_t* to_dmq_node = find_dmq_node_uri(node_list, &to_str); + if(!to_dmq_node) { + LM_ERR("cannot find dmq_node: %.*s\n", to_str.len, to_str.s); + goto error; + } + if(send_dmq_message(destination_peer, &body_str, to_dmq_node, &notification_callback, 1) < 0) { + LM_ERR("cannot send dmq message\n"); + goto error; + } + return 0; +error: + return -1; +} + /* pings the servers in the nodelist * if the server does not reply to the ping, it is removed from the list * the ping messages are actualy notification requests diff --git a/modules_k/dmq/dmq_funcs.h b/modules_k/dmq/dmq_funcs.h index 1c6dd91..7381da6 100644 --- a/modules_k/dmq/dmq_funcs.h +++ b/modules_k/dmq/dmq_funcs.h @@ -21,6 +21,7 @@ typedef struct dmq_cback_param { dmq_node_t* node; } dmq_cback_param_t; +int cfg_send_dmq_message(struct sip_msg* msg, char* peer, char* to, char* body); dmq_peer_t* register_dmq_peer(dmq_peer_t* peer); int send_dmq_message(dmq_peer_t* peer, str* body, dmq_node_t* node, dmq_resp_cback_t* resp_cback, int max_forwards); int bcast_dmq_message(dmq_peer_t* peer, str* body, dmq_node_t* except, dmq_resp_cback_t* resp_cback, int max_forwards); diff --git a/modules_k/dmq/peer.c b/modules_k/dmq/peer.c index 588445f..84dfc1c 100644 --- a/modules_k/dmq/peer.c +++ b/modules_k/dmq/peer.c @@ -43,3 +43,6 @@ dmq_peer_t* find_peer(str peer_id) { return search_peer_list(peer_list, &foo_peer); } +int empty_peer_callback(struct sip_msg* msg, peer_reponse_t* resp) { + return 0; +} \ No newline at end of file diff --git a/modules_k/dmq/peer.h b/modules_k/dmq/peer.h index b2ec9a2..5ccb980 100644 --- a/modules_k/dmq/peer.h +++ b/modules_k/dmq/peer.h @@ -39,7 +39,7 @@ typedef dmq_peer_t* (*register_dmq_peer_t)(dmq_peer_t*); dmq_peer_t* add_peer(dmq_peer_list_t* peer_list, dmq_peer_t* peer); dmq_peer_t* find_peer(str peer_id); - +int empty_peer_callback(struct sip_msg* msg, peer_reponse_t* resp); #endif

2 1

RAW socket support for Darwin (OSX)
by Raphael Coeffic 02 Feb '12

02 Feb '12

Hi! I'm currently having some issues trying to get raw socket support working on OSX. It appears that raw_udp4_send() in raw_sock.c does not compile because OSX support neither IP_PKTINFO nor IP_SENDSRCADDR. However, it seems that raw_udp4_send is not used anywhere, and everything now works over raw_iphdr_udp4_send(), for which only IP_HDRINCL is needed, which is well supported on OSX. Is that correct that rwa_udp4_send is not used anymore? Could I just remove it /comment it out? Best regards Raphael.

2 2

git:master: modules_k/pv: pv_trans buffer: malloc must allocate pointers, not bytes.
by Alex Hermann 02 Feb '12

02 Feb '12

Module: sip-router Branch: master Commit: cc3a0b55fe8bdfc106ae782efe55bd0ac2f1be99 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc3a0b5… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Feb 2 10:40:35 2012 +0100 modules_k/pv: pv_trans buffer: malloc must allocate pointers, not bytes. --- modules_k/pv/pv_trans.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index 22d3a9e..0b2f4d7 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -68,7 +68,7 @@ int tr_init_buffers(void) { int i; - _tr_buffer_list = (char**)malloc(TR_BUFFER_SLOTS); + _tr_buffer_list = (char**)malloc(TR_BUFFER_SLOTS * sizeof(char*)); if(_tr_buffer_list==NULL) return -1; for(i=0; i<TR_BUFFER_SLOTS; i++) {

1 0

git:master: core/ser_stun.c: fixed compile warnings
by admin＠sip-router.org 02 Feb '12

02 Feb '12

Module: sip-router Branch: master Commit: 4bdbca2dc4237fa7a08fe61c4ebe828ec7c92274 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4bdbca2… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Feb 2 04:16:57 2012 +0200 core/ser_stun.c: fixed compile warnings --- ser_stun.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ser_stun.c b/ser_stun.c index 0abbad3..86eab5a 100644 --- a/ser_stun.c +++ b/ser_stun.c @@ -766,9 +766,11 @@ int stun_add_address_attr(struct stun_msg* res, int do_xor) { struct stun_attr attr; - UINT_T id[IP_ADDR]; int ip_struct_len; +#ifdef USE_IPV6 + UINT_T id[IP_ADDR]; int i; +#endif /* USE_IPV6 */ ip_struct_len = 0; attr.type = htons(type);

1 0

K|S usrloc merge
by Jason Penton 01 Feb '12

01 Feb '12

Daniel, you will probably be most interested in this based on yesterday's dev chat.... Following the discussion from the dev irc yesterday re. usrloc requirements: To summarise the functionality required for GRUU - unique id (for you) and custom subscriber data (for us). As you mentioned yesterday, S version of usrloc has this particular functionality. After a brief look at S-version of usrloc this morning, I have to say I prefer it. Mainly because of the way it handles urecords and ucontacts separately. In K-version - a urecord structure really only exists if there is a contact. There are more deadly implications when in DB mode where a static urecord structure is built on demand. IMHO, I think we should use S module as the basis of a merge? I'd be interested in yours/other interested members' input. Cheers Jason

2 2

Alternative Debian APT repository
by Daniel-Constantin Mierla 01 Feb '12

01 Feb '12

Hello, besides existing deb.kamailio.org, I added builds for Debian 5.0, 6.0 and Ubuntu 10.04 to the OpenSUSE Build Service (OBS). These repositories are built only for stable releases in 3.2.x series. Main target for them is to be sure the releases compile properly, across main Linux distributions, OBS providing an easy interface to keep updating and building until everything is ok. Anyhow, these alternative repositories may be handy to use for some of you. Details about setting APT sources are available at: http://www.kamailio.org/wiki/packages/debs#using_obs_repository Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com http://linkedin.com/in/miconda -- http://twitter.com/miconda

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2012