sr-dev October 2011

sr-dev@lists.kamailio.org

37 participants
283 discussions

git:master: presence_xml: remove unecessary include
by Daniel-Constantin Mierla 18 Oct '11

18 Oct '11

Module: sip-router Branch: master Commit: 82b44dc4b97a9bd9a3e0720e06c4dda69995b998 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82b44dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 18 13:02:53 2011 +0200 presence_xml: remove unecessary include - adds warnings about strptime --- modules_k/presence_xml/pidf.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules_k/presence_xml/pidf.c b/modules_k/presence_xml/pidf.c index 822ebea..85f4041 100644 --- a/modules_k/presence_xml/pidf.c +++ b/modules_k/presence_xml/pidf.c @@ -31,7 +31,6 @@ * \ingroup presence_xml */ -#include "../../sr_module.h" /** * make strptime available

1 0

git:master: core and modules: fix compile warnings on freebsd
by Daniel-Constantin Mierla 18 Oct '11

18 Oct '11

Module: sip-router Branch: master Commit: 7dfda822e579a543bbda65dc4764b0f426a144e5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7dfda82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 18 12:50:49 2011 +0200 core and modules: fix compile warnings on freebsd --- lib/srdb2/db_uri.c | 4 +++- modules_k/acc/acc_cdr.c | 4 ++-- modules_k/dmq/bind_dmq.c | 3 ++- modules_k/dmq/bind_dmq.h | 3 ++- modules_k/dmq/dmq.c | 3 ++- modules_k/dmq/dmq.h | 3 ++- modules_k/dmq/dmq_funcs.c | 1 + modules_k/dmq/dmq_funcs.h | 3 ++- modules_k/dmq/dmqnode.c | 1 + modules_k/dmq/dmqnode.h | 3 ++- modules_k/dmq/message.c | 3 ++- modules_k/dmq/message.h | 3 ++- modules_k/dmq/notification_peer.c | 1 + modules_k/dmq/notification_peer.h | 3 ++- modules_k/dmq/peer.c | 3 ++- modules_k/dmq/peer.h | 3 ++- modules_k/dmq/worker.c | 1 + modules_k/dmq/worker.h | 3 ++- modules_k/nat_traversal/nat_traversal.c | 4 ++-- modules_k/p_usrloc/ul_db_handle.c | 2 +- modules_k/presence_xml/pidf.c | 3 ++- modules_k/pv/pv_xavp.c | 4 ++-- 22 files changed, 40 insertions(+), 21 deletions(-) diff --git a/lib/srdb2/db_uri.c b/lib/srdb2/db_uri.c index e87e8f2..0c37c89 100644 --- a/lib/srdb2/db_uri.c +++ b/lib/srdb2/db_uri.c @@ -71,6 +71,7 @@ db_uri_t* db_uri(const char* uri) char* colon; int len; db_uri_t* newp; + char *turi; newp = (db_uri_t*)pkg_malloc(sizeof(db_uri_t)); if (newp == NULL) goto error; @@ -78,7 +79,8 @@ db_uri_t* db_uri(const char* uri) if (db_gen_init(&newp->gen) < 0) goto error; len = strlen(uri); - colon = q_memchr((char *)uri, ':', len); + turi = (char*)uri; + colon = q_memchr(turi, ':', len); if (colon == NULL) { newp->scheme.s = pkg_malloc(len + 1); if (newp->scheme.s == NULL) goto error; diff --git a/modules_k/acc/acc_cdr.c b/modules_k/acc/acc_cdr.c index f4b9348..88d4a22 100644 --- a/modules_k/acc/acc_cdr.c +++ b/modules_k/acc/acc_cdr.c @@ -242,9 +242,9 @@ static int time2string( struct timeval* time_value, str* time_str) buffer_length = snprintf( time_buffer, TIME_BUFFER_LENGTH, "%ld%c%03d", - time_value->tv_sec, + (long int)time_value->tv_sec, time_separator, - (int)time_value->tv_usec/1000); + (int)(time_value->tv_usec/1000)); if( buffer_length < 0) { diff --git a/modules_k/dmq/bind_dmq.c b/modules_k/dmq/bind_dmq.c index 88e02ff..472babb 100644 --- a/modules_k/dmq/bind_dmq.c +++ b/modules_k/dmq/bind_dmq.c @@ -8,4 +8,5 @@ int bind_dmq(dmq_api_t* api) { api->send_message = send_dmq_message; api->bcast_message = bcast_dmq_message; return 0; -} \ No newline at end of file +} + diff --git a/modules_k/dmq/bind_dmq.h b/modules_k/dmq/bind_dmq.h index f15e673..d89b534 100644 --- a/modules_k/dmq/bind_dmq.h +++ b/modules_k/dmq/bind_dmq.h @@ -18,4 +18,5 @@ typedef int (*bind_dmq_f)(dmq_api_t* api); int bind_dmq(dmq_api_t* api); -#endif \ No newline at end of file +#endif + diff --git a/modules_k/dmq/dmq.c b/modules_k/dmq/dmq.c index c8fbff9..7a62302 100644 --- a/modules_k/dmq/dmq.c +++ b/modules_k/dmq/dmq.c @@ -280,4 +280,5 @@ static int parse_server_address(str* uri, struct sip_uri* parsed_uri) { empty: uri->s = NULL; return 0; -} \ No newline at end of file +} + diff --git a/modules_k/dmq/dmq.h b/modules_k/dmq/dmq.h index e4c639c..df92cea 100644 --- a/modules_k/dmq/dmq.h +++ b/modules_k/dmq/dmq.h @@ -49,4 +49,5 @@ static inline int dmq_load_api(dmq_api_t* api) { int handle_dmq_message(struct sip_msg* msg, char* str1 ,char* str2); -#endif \ No newline at end of file +#endif + diff --git a/modules_k/dmq/dmq_funcs.c b/modules_k/dmq/dmq_funcs.c index afb50f4..a71da87 100644 --- a/modules_k/dmq/dmq_funcs.c +++ b/modules_k/dmq/dmq_funcs.c @@ -167,3 +167,4 @@ void ping_servers(unsigned int ticks,void *param) { LM_ERR("error broadcasting message\n"); } } + diff --git a/modules_k/dmq/dmq_funcs.h b/modules_k/dmq/dmq_funcs.h index 8ba2503..1c6dd91 100644 --- a/modules_k/dmq/dmq_funcs.h +++ b/modules_k/dmq/dmq_funcs.h @@ -25,4 +25,5 @@ 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); -#endif \ No newline at end of file +#endif + diff --git a/modules_k/dmq/dmqnode.c b/modules_k/dmq/dmqnode.c index d567a34..36971e9 100644 --- a/modules_k/dmq/dmqnode.c +++ b/modules_k/dmq/dmqnode.c @@ -246,3 +246,4 @@ int build_node_str(dmq_node_t* node, char* buf, int buflen) { len += get_status_str(node->status)->len; return len; } + diff --git a/modules_k/dmq/dmqnode.h b/modules_k/dmq/dmqnode.h index e2c2437..43b4820 100644 --- a/modules_k/dmq/dmqnode.h +++ b/modules_k/dmq/dmqnode.h @@ -54,4 +54,5 @@ int build_node_str(dmq_node_t* node, char* buf, int buflen); extern dmq_node_t* self_node; extern dmq_node_t* notification_node; -#endif \ No newline at end of file +#endif + diff --git a/modules_k/dmq/message.c b/modules_k/dmq/message.c index 434f80d..3971ab5 100644 --- a/modules_k/dmq/message.c +++ b/modules_k/dmq/message.c @@ -47,4 +47,5 @@ int handle_dmq_message(struct sip_msg* msg, char* str1, char* str2) { return 0; error: return -1; -} \ No newline at end of file +} + diff --git a/modules_k/dmq/message.h b/modules_k/dmq/message.h index 7e0cb95..e9a01a7 100644 --- a/modules_k/dmq/message.h +++ b/modules_k/dmq/message.h @@ -1,2 +1,3 @@ -int handle_dmq_message(struct sip_msg*, char*, char*); \ No newline at end of file +int handle_dmq_message(struct sip_msg*, char*, char*); + diff --git a/modules_k/dmq/notification_peer.c b/modules_k/dmq/notification_peer.c index ea12dd8..a6d134b 100644 --- a/modules_k/dmq/notification_peer.c +++ b/modules_k/dmq/notification_peer.c @@ -218,3 +218,4 @@ int notification_resp_callback_f(struct sip_msg* msg, int code, dmq_node_t* node } return 0; } + diff --git a/modules_k/dmq/notification_peer.h b/modules_k/dmq/notification_peer.h index 78cf190..001b530 100644 --- a/modules_k/dmq/notification_peer.h +++ b/modules_k/dmq/notification_peer.h @@ -23,4 +23,5 @@ dmq_node_t* add_server_and_notify(str* server_address); /* helper functions */ extern int notification_resp_callback_f(struct sip_msg* msg, int code, dmq_node_t* node, void* param); -extern dmq_resp_cback_t notification_callback; \ No newline at end of file +extern dmq_resp_cback_t notification_callback; + diff --git a/modules_k/dmq/peer.c b/modules_k/dmq/peer.c index 39ae836..588445f 100644 --- a/modules_k/dmq/peer.c +++ b/modules_k/dmq/peer.c @@ -41,4 +41,5 @@ dmq_peer_t* find_peer(str peer_id) { dmq_peer_t foo_peer; foo_peer.peer_id = peer_id; return search_peer_list(peer_list, &foo_peer); -} \ No newline at end of file +} + diff --git a/modules_k/dmq/peer.h b/modules_k/dmq/peer.h index 0d543bd..b2ec9a2 100644 --- a/modules_k/dmq/peer.h +++ b/modules_k/dmq/peer.h @@ -41,4 +41,5 @@ dmq_peer_t* add_peer(dmq_peer_list_t* peer_list, dmq_peer_t* peer); dmq_peer_t* find_peer(str peer_id); -#endif \ No newline at end of file +#endif + diff --git a/modules_k/dmq/worker.c b/modules_k/dmq/worker.c index fbf5443..9da3b9f 100644 --- a/modules_k/dmq/worker.c +++ b/modules_k/dmq/worker.c @@ -183,3 +183,4 @@ dmq_job_t* job_queue_pop(job_queue_t* queue) { lock_release(&queue->lock); return front; } + diff --git a/modules_k/dmq/worker.h b/modules_k/dmq/worker.h index 61eda09..d6f8dbd 100644 --- a/modules_k/dmq/worker.h +++ b/modules_k/dmq/worker.h @@ -40,4 +40,5 @@ void job_queue_push(job_queue_t* queue, dmq_job_t* job); dmq_job_t* job_queue_pop(job_queue_t* queue); int job_queue_size(job_queue_t* queue); -#endif \ No newline at end of file +#endif + diff --git a/modules_k/nat_traversal/nat_traversal.c b/modules_k/nat_traversal/nat_traversal.c index 62227e4..9877766 100644 --- a/modules_k/nat_traversal/nat_traversal.c +++ b/modules_k/nat_traversal/nat_traversal.c @@ -1626,8 +1626,8 @@ save_keepalive_state(void) fprintf(f, "%s %.*s %ld %ld\n", contact->uri, contact->socket->sock_str.len, contact->socket->sock_str.s, - contact->registration_expire, - contact->subscription_expire); + (long int)contact->registration_expire, + (long int)contact->subscription_expire); contact = contact->next; } } diff --git a/modules_k/p_usrloc/ul_db_handle.c b/modules_k/p_usrloc/ul_db_handle.c index 3216426..49dc464 100644 --- a/modules_k/p_usrloc/ul_db_handle.c +++ b/modules_k/p_usrloc/ul_db_handle.c @@ -458,7 +458,7 @@ int check_handle(db_func_t * dbf, db1_con_t * dbh, ul_db_handle_t * handle){ } else if((handle->db[i].status == DB_ON) && handle->db[i].dbh) { if((handle->db[i].failover_time < (time(NULL) - expire_time)) && (handle->db[i].failover_time != UL_DB_ZERO_TIME)){ LM_ERR("%s: failover_time: %ld, now: %ld, delta: %ld, now going to reset failover time\n", __FUNCTION__, - handle->db[i].failover_time, time(NULL), (time(NULL) - handle->db[i].failover_time)); + (long int)handle->db[i].failover_time, (long int)time(NULL), (long int)(time(NULL) - handle->db[i].failover_time)); if(db_reset_failover_time(handle, handle->db[i].no) < 0) { LM_ERR("could not reset failover time for id %i, db %i.\n", handle->id, handle->db[i].no); diff --git a/modules_k/presence_xml/pidf.c b/modules_k/presence_xml/pidf.c index 95b0a47..822ebea 100644 --- a/modules_k/presence_xml/pidf.c +++ b/modules_k/presence_xml/pidf.c @@ -31,6 +31,8 @@ * \ingroup presence_xml */ +#include "../../sr_module.h" + /** * make strptime available * use 600 for 'Single UNIX Specification, Version 3' @@ -55,7 +57,6 @@ #include <stdlib.h> #include <libxml/parser.h> #include "../../dprint.h" -#include "../../sr_module.h" #include "pidf.h" xmlAttrPtr xmlNodeGetAttrByName(xmlNodePtr node, const char *name) diff --git a/modules_k/pv/pv_xavp.c b/modules_k/pv/pv_xavp.c index e706d04..b434794 100644 --- a/modules_k/pv/pv_xavp.c +++ b/modules_k/pv/pv_xavp.c @@ -42,11 +42,11 @@ int pv_xavp_get_value(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &avp->val.v.s); break; case SR_XTYPE_TIME: - if(snprintf(_pv_xavp_buf, 128, "%lu", avp->val.v.t)<0) + if(snprintf(_pv_xavp_buf, 128, "%lu", (long unsigned)avp->val.v.t)<0) return pv_get_null(msg, param, res); break; case SR_XTYPE_LONG: - if(snprintf(_pv_xavp_buf, 128, "%ld", avp->val.v.l)<0) + if(snprintf(_pv_xavp_buf, 128, "%ld", (long unsigned)avp->val.v.l)<0) return pv_get_null(msg, param, res); break; case SR_XTYPE_LLONG:

1 0

git:3.2: core and modules: fix compile warning
by Daniel-Constantin Mierla 18 Oct '11

18 Oct '11

Module: sip-router Branch: 3.2 Commit: 2a6b94c7ac3ce8c87509381f85861be484d247b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2a6b94c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 18 11:10:51 2011 +0200 core and modules: fix compile warning (cherry picked from commit e91db504fda2a878418b94f6ab454b22c44fa369) --- modules_k/db_sqlite/db_sqlite.c | 1 + modules_k/dmq/dmqnode.c | 28 ++++++++++++++-------------- modules_k/dmq/worker.c | 4 ++-- modules_k/presence_conference/pidf.c | 15 ++++++++------- xavp.c | 3 ++- 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/modules_k/db_sqlite/db_sqlite.c b/modules_k/db_sqlite/db_sqlite.c index 4d0ce56..520cc38 100644 --- a/modules_k/db_sqlite/db_sqlite.c +++ b/modules_k/db_sqlite/db_sqlite.c @@ -26,6 +26,7 @@ #include <sqlite3.h> #include "../../sr_module.h" +#include "../../lib/srdb1/db_query.h" #include "../../lib/srdb1/db.h" #include "dbase.h" diff --git a/modules_k/dmq/dmqnode.c b/modules_k/dmq/dmqnode.c index 25334bc..d567a34 100644 --- a/modules_k/dmq/dmqnode.c +++ b/modules_k/dmq/dmqnode.c @@ -36,7 +36,7 @@ dmq_node_list_t* init_dmq_node_list() { return node_list; } -inline int cmp_dmq_node(dmq_node_t* node, dmq_node_t* cmpnode) { +int cmp_dmq_node(dmq_node_t* node, dmq_node_t* cmpnode) { if(!node || !cmpnode) { LM_ERR("cmp_dmq_node - null node received\n"); return -1; @@ -45,7 +45,7 @@ inline int cmp_dmq_node(dmq_node_t* node, dmq_node_t* cmpnode) { STR_EQ(node->uri.port, cmpnode->uri.port); } -static str* get_param_value(param_t* params, str* param) { +str* get_param_value(param_t* params, str* param) { while (params) { if ((params->name.len == param->len) && (strncmp(params->name.s, param->s, param->len) == 0)) { @@ -56,7 +56,7 @@ static str* get_param_value(param_t* params, str* param) { return NULL; } -inline int set_dmq_node_params(dmq_node_t* node, param_t* params) { +int set_dmq_node_params(dmq_node_t* node, param_t* params) { str* status; if(!params) { LM_DBG("no parameters given\n"); @@ -80,12 +80,12 @@ error: return -1; } -inline int set_default_dmq_node_params(dmq_node_t* node) { +int set_default_dmq_node_params(dmq_node_t* node) { node->status = DMQ_NODE_ACTIVE; return 0; } -inline dmq_node_t* build_dmq_node(str* uri, int shm) { +dmq_node_t* build_dmq_node(str* uri, int shm) { dmq_node_t* ret; param_hooks_t hooks; param_t* params; @@ -135,7 +135,7 @@ error: return NULL; } -inline dmq_node_t* find_dmq_node_uri(dmq_node_list_t* list, str* uri) { +dmq_node_t* find_dmq_node_uri(dmq_node_list_t* list, str* uri) { dmq_node_t *ret, *find; find = build_dmq_node(uri, 0); ret = find_dmq_node(list, find); @@ -143,7 +143,7 @@ inline dmq_node_t* find_dmq_node_uri(dmq_node_list_t* list, str* uri) { return ret; } -inline void destroy_dmq_node(dmq_node_t* node, int shm) { +void destroy_dmq_node(dmq_node_t* node, int shm) { if(shm) { shm_free_node(node); } else { @@ -151,7 +151,7 @@ inline void destroy_dmq_node(dmq_node_t* node, int shm) { } } -inline dmq_node_t* find_dmq_node(dmq_node_list_t* list, dmq_node_t* node) { +dmq_node_t* find_dmq_node(dmq_node_list_t* list, dmq_node_t* node) { dmq_node_t* cur = list->nodes; while(cur) { if(cmp_dmq_node(cur, node)) { @@ -162,7 +162,7 @@ inline dmq_node_t* find_dmq_node(dmq_node_list_t* list, dmq_node_t* node) { return NULL; } -inline dmq_node_t* shm_dup_node(dmq_node_t* node) { +dmq_node_t* shm_dup_node(dmq_node_t* node) { dmq_node_t* newnode = shm_malloc(sizeof(dmq_node_t)); memcpy(newnode, node, sizeof(dmq_node_t)); shm_str_dup(&newnode->orig_uri, &node->orig_uri); @@ -177,17 +177,17 @@ error: return NULL; } -inline void shm_free_node(dmq_node_t* node) { +void shm_free_node(dmq_node_t* node) { shm_free(node->orig_uri.s); shm_free(node); } -inline void pkg_free_node(dmq_node_t* node) { +void pkg_free_node(dmq_node_t* node) { pkg_free(node->orig_uri.s); pkg_free(node); } -inline int del_dmq_node(dmq_node_list_t* list, dmq_node_t* node) { +int del_dmq_node(dmq_node_list_t* list, dmq_node_t* node) { dmq_node_t *cur, **prev; lock_get(&list->lock); cur = list->nodes; @@ -206,7 +206,7 @@ inline int del_dmq_node(dmq_node_list_t* list, dmq_node_t* node) { return 0; } -inline dmq_node_t* add_dmq_node(dmq_node_list_t* list, str* uri) { +dmq_node_t* add_dmq_node(dmq_node_list_t* list, str* uri) { dmq_node_t* newnode = build_dmq_node(uri, 1); if(!newnode) { LM_ERR("error creating node\n"); @@ -245,4 +245,4 @@ int build_node_str(dmq_node_t* node, char* buf, int buflen) { memcpy(buf + len, get_status_str(node->status)->s, get_status_str(node->status)->len); len += get_status_str(node->status)->len; return len; -} \ No newline at end of file +} diff --git a/modules_k/dmq/worker.c b/modules_k/dmq/worker.c index cf206f0..fbf5443 100644 --- a/modules_k/dmq/worker.c +++ b/modules_k/dmq/worker.c @@ -91,7 +91,7 @@ void worker_loop(int id) { int add_dmq_job(struct sip_msg* msg, dmq_peer_t* peer) { int i, found_available = 0; - dmq_job_t new_job; + dmq_job_t new_job = { 0 }; dmq_worker_t* worker; new_job.f = peer->callback; new_job.msg = msg; @@ -182,4 +182,4 @@ dmq_job_t* job_queue_pop(job_queue_t* queue) { atomic_dec(&queue->count); lock_release(&queue->lock); return front; -} \ No newline at end of file +} diff --git a/modules_k/presence_conference/pidf.c b/modules_k/presence_conference/pidf.c index 2b2d45c..a4c1179 100644 --- a/modules_k/presence_conference/pidf.c +++ b/modules_k/presence_conference/pidf.c @@ -31,13 +31,6 @@ * \ingroup presence_xml */ -#include <string.h> -#include <stdlib.h> -#include <libxml/parser.h> -#include "../../dprint.h" -#include "../../sr_module.h" -#include "pidf.h" - /** * make strptime available * use 600 for 'Single UNIX Specification, Version 3' @@ -48,6 +41,7 @@ #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect of the above define on features.h/unistd.h syscall() */ + #define _DARWIN_C_SOURCE 1 #else #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #endif @@ -57,6 +51,13 @@ #undef _XOPEN_SOURCE #undef _XOPEN_SOURCE_EXTENDED +#include <string.h> +#include <stdlib.h> +#include <libxml/parser.h> +#include "../../dprint.h" +#include "../../sr_module.h" +#include "pidf.h" + xmlAttrPtr xmlNodeGetAttrByName(xmlNodePtr node, const char *name) { xmlAttrPtr attr = node->properties; diff --git a/xavp.c b/xavp.c index 265729e..fed62ee 100644 --- a/xavp.c +++ b/xavp.c @@ -428,7 +428,8 @@ void xavp_print_list_content(sr_xavp_t **head, int level) LM_INFO(" XAVP value: %s\n", avp->val.v.s.s); break; case SR_XTYPE_TIME: - LM_INFO(" XAVP value: %lu\n", avp->val.v.t); + LM_INFO(" XAVP value: %lu\n", + (long unsigned int)avp->val.v.t); break; case SR_XTYPE_LONG: LM_INFO(" XAVP value: %ld\n", avp->val.v.l);

1 0

git:master: core and modules: fix compile warning
by Daniel-Constantin Mierla 18 Oct '11

18 Oct '11

Module: sip-router Branch: master Commit: e91db504fda2a878418b94f6ab454b22c44fa369 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e91db50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 18 11:10:51 2011 +0200 core and modules: fix compile warning --- modules_k/db_sqlite/db_sqlite.c | 1 + modules_k/dmq/dmqnode.c | 28 ++++++++++++++-------------- modules_k/dmq/worker.c | 4 ++-- modules_k/presence_conference/pidf.c | 15 ++++++++------- xavp.c | 3 ++- 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/modules_k/db_sqlite/db_sqlite.c b/modules_k/db_sqlite/db_sqlite.c index 4d0ce56..520cc38 100644 --- a/modules_k/db_sqlite/db_sqlite.c +++ b/modules_k/db_sqlite/db_sqlite.c @@ -26,6 +26,7 @@ #include <sqlite3.h> #include "../../sr_module.h" +#include "../../lib/srdb1/db_query.h" #include "../../lib/srdb1/db.h" #include "dbase.h" diff --git a/modules_k/dmq/dmqnode.c b/modules_k/dmq/dmqnode.c index 25334bc..d567a34 100644 --- a/modules_k/dmq/dmqnode.c +++ b/modules_k/dmq/dmqnode.c @@ -36,7 +36,7 @@ dmq_node_list_t* init_dmq_node_list() { return node_list; } -inline int cmp_dmq_node(dmq_node_t* node, dmq_node_t* cmpnode) { +int cmp_dmq_node(dmq_node_t* node, dmq_node_t* cmpnode) { if(!node || !cmpnode) { LM_ERR("cmp_dmq_node - null node received\n"); return -1; @@ -45,7 +45,7 @@ inline int cmp_dmq_node(dmq_node_t* node, dmq_node_t* cmpnode) { STR_EQ(node->uri.port, cmpnode->uri.port); } -static str* get_param_value(param_t* params, str* param) { +str* get_param_value(param_t* params, str* param) { while (params) { if ((params->name.len == param->len) && (strncmp(params->name.s, param->s, param->len) == 0)) { @@ -56,7 +56,7 @@ static str* get_param_value(param_t* params, str* param) { return NULL; } -inline int set_dmq_node_params(dmq_node_t* node, param_t* params) { +int set_dmq_node_params(dmq_node_t* node, param_t* params) { str* status; if(!params) { LM_DBG("no parameters given\n"); @@ -80,12 +80,12 @@ error: return -1; } -inline int set_default_dmq_node_params(dmq_node_t* node) { +int set_default_dmq_node_params(dmq_node_t* node) { node->status = DMQ_NODE_ACTIVE; return 0; } -inline dmq_node_t* build_dmq_node(str* uri, int shm) { +dmq_node_t* build_dmq_node(str* uri, int shm) { dmq_node_t* ret; param_hooks_t hooks; param_t* params; @@ -135,7 +135,7 @@ error: return NULL; } -inline dmq_node_t* find_dmq_node_uri(dmq_node_list_t* list, str* uri) { +dmq_node_t* find_dmq_node_uri(dmq_node_list_t* list, str* uri) { dmq_node_t *ret, *find; find = build_dmq_node(uri, 0); ret = find_dmq_node(list, find); @@ -143,7 +143,7 @@ inline dmq_node_t* find_dmq_node_uri(dmq_node_list_t* list, str* uri) { return ret; } -inline void destroy_dmq_node(dmq_node_t* node, int shm) { +void destroy_dmq_node(dmq_node_t* node, int shm) { if(shm) { shm_free_node(node); } else { @@ -151,7 +151,7 @@ inline void destroy_dmq_node(dmq_node_t* node, int shm) { } } -inline dmq_node_t* find_dmq_node(dmq_node_list_t* list, dmq_node_t* node) { +dmq_node_t* find_dmq_node(dmq_node_list_t* list, dmq_node_t* node) { dmq_node_t* cur = list->nodes; while(cur) { if(cmp_dmq_node(cur, node)) { @@ -162,7 +162,7 @@ inline dmq_node_t* find_dmq_node(dmq_node_list_t* list, dmq_node_t* node) { return NULL; } -inline dmq_node_t* shm_dup_node(dmq_node_t* node) { +dmq_node_t* shm_dup_node(dmq_node_t* node) { dmq_node_t* newnode = shm_malloc(sizeof(dmq_node_t)); memcpy(newnode, node, sizeof(dmq_node_t)); shm_str_dup(&newnode->orig_uri, &node->orig_uri); @@ -177,17 +177,17 @@ error: return NULL; } -inline void shm_free_node(dmq_node_t* node) { +void shm_free_node(dmq_node_t* node) { shm_free(node->orig_uri.s); shm_free(node); } -inline void pkg_free_node(dmq_node_t* node) { +void pkg_free_node(dmq_node_t* node) { pkg_free(node->orig_uri.s); pkg_free(node); } -inline int del_dmq_node(dmq_node_list_t* list, dmq_node_t* node) { +int del_dmq_node(dmq_node_list_t* list, dmq_node_t* node) { dmq_node_t *cur, **prev; lock_get(&list->lock); cur = list->nodes; @@ -206,7 +206,7 @@ inline int del_dmq_node(dmq_node_list_t* list, dmq_node_t* node) { return 0; } -inline dmq_node_t* add_dmq_node(dmq_node_list_t* list, str* uri) { +dmq_node_t* add_dmq_node(dmq_node_list_t* list, str* uri) { dmq_node_t* newnode = build_dmq_node(uri, 1); if(!newnode) { LM_ERR("error creating node\n"); @@ -245,4 +245,4 @@ int build_node_str(dmq_node_t* node, char* buf, int buflen) { memcpy(buf + len, get_status_str(node->status)->s, get_status_str(node->status)->len); len += get_status_str(node->status)->len; return len; -} \ No newline at end of file +} diff --git a/modules_k/dmq/worker.c b/modules_k/dmq/worker.c index cf206f0..fbf5443 100644 --- a/modules_k/dmq/worker.c +++ b/modules_k/dmq/worker.c @@ -91,7 +91,7 @@ void worker_loop(int id) { int add_dmq_job(struct sip_msg* msg, dmq_peer_t* peer) { int i, found_available = 0; - dmq_job_t new_job; + dmq_job_t new_job = { 0 }; dmq_worker_t* worker; new_job.f = peer->callback; new_job.msg = msg; @@ -182,4 +182,4 @@ dmq_job_t* job_queue_pop(job_queue_t* queue) { atomic_dec(&queue->count); lock_release(&queue->lock); return front; -} \ No newline at end of file +} diff --git a/modules_k/presence_conference/pidf.c b/modules_k/presence_conference/pidf.c index 2b2d45c..a4c1179 100644 --- a/modules_k/presence_conference/pidf.c +++ b/modules_k/presence_conference/pidf.c @@ -31,13 +31,6 @@ * \ingroup presence_xml */ -#include <string.h> -#include <stdlib.h> -#include <libxml/parser.h> -#include "../../dprint.h" -#include "../../sr_module.h" -#include "pidf.h" - /** * make strptime available * use 600 for 'Single UNIX Specification, Version 3' @@ -48,6 +41,7 @@ #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect of the above define on features.h/unistd.h syscall() */ + #define _DARWIN_C_SOURCE 1 #else #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #endif @@ -57,6 +51,13 @@ #undef _XOPEN_SOURCE #undef _XOPEN_SOURCE_EXTENDED +#include <string.h> +#include <stdlib.h> +#include <libxml/parser.h> +#include "../../dprint.h" +#include "../../sr_module.h" +#include "pidf.h" + xmlAttrPtr xmlNodeGetAttrByName(xmlNodePtr node, const char *name) { xmlAttrPtr attr = node->properties; diff --git a/xavp.c b/xavp.c index 265729e..fed62ee 100644 --- a/xavp.c +++ b/xavp.c @@ -428,7 +428,8 @@ void xavp_print_list_content(sr_xavp_t **head, int level) LM_INFO(" XAVP value: %s\n", avp->val.v.s.s); break; case SR_XTYPE_TIME: - LM_INFO(" XAVP value: %lu\n", avp->val.v.t); + LM_INFO(" XAVP value: %lu\n", + (long unsigned int)avp->val.v.t); break; case SR_XTYPE_LONG: LM_INFO(" XAVP value: %ld\n", avp->val.v.l);

1 0

git:3.2: dialplan: added sample records to readme
by Daniel-Constantin Mierla 18 Oct '11

18 Oct '11

Module: sip-router Branch: 3.2 Commit: 08390a9a79e111e2d22533476d397dd9a92744ac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=08390a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 17 18:42:39 2011 +0200 dialplan: added sample records to readme - added note about limitation in using pseudo-variables in replacement expressions --- modules/dialplan/README | 32 ++++++++++++++++++++++++ modules/dialplan/doc/dialplan_admin.xml | 40 +++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/modules/dialplan/README b/modules/dialplan/README index 3036a3f..95f2950 100644 --- a/modules/dialplan/README +++ b/modules/dialplan/README @@ -78,6 +78,7 @@ Juha Heinanen 1.12. Set fetch_rows parameter 1.13. dp_translate usage 1.14. dp_translate usage + 1.15. Example of rules Chapter 1. Admin Guide @@ -456,6 +457,37 @@ xlog("translated to var $var(y) \n"); the complete database documentation on the project webpage, http://www.kamailio.org/docs/db-tables/kamailio-db-devel.html. + Some sample records fromd dialplan table are presented in the next + figure. + + Example 1.15. Example of rules +... +dpid: 1 +pr: 1 +match_op: 1 +match_exp: ^0([1-9][0-9]+)$ +match_len: 0 +subst_exp: ^0([1-9][0-9]+)$ +repl_exp: 0049\1 +attrs: xyz +... +dpid: 1 +pr: 1 +match_op: 1 +match_exp: ^0([1-9][0-9]+)$ +match_len: 0 +subst_exp: ^0(.+)$ +repl_exp: $var(prefix)\1 +attrs: xyz +... + + Note that you can use config variables in the replacement expression + (repl_exp) field. However, not all of config variables are safe to use + there - specifically the variables that have in their name other + variables (variables with dinamic name). References to sip message, + private variables ($var(...)) and AVPs with static name are among those + that are safe to use in replacement expressions. + Chapter 2. Developer's Guide The module does not provide any API to use in other Kamailio modules. diff --git a/modules/dialplan/doc/dialplan_admin.xml b/modules/dialplan/doc/dialplan_admin.xml index 9e9610b..398b934 100644 --- a/modules/dialplan/doc/dialplan_admin.xml +++ b/modules/dialplan/doc/dialplan_admin.xml @@ -563,12 +563,48 @@ xlog("translated to var $var(y) \n"); <section> <title>Installation</title> <para> - The modules requires one table in &kamailio; database: dialplan. The SQL - syntax to create them can be found in dialplan-create.sql + The modules requires one table in &kamailio; database: dialplan. + The SQL syntax to create them can be found in dialplan-create.sql script in the database directories in the kamailio/scripts folder. You can also find the complete database documentation on the project webpage, &kamailiodbdocslink;. </para> + <para> + Some sample records fromd dialplan table are presented in the next + figure. + </para> + <example> + <title>Example of rules</title> + <programlisting format="linespecific"> +... +dpid: 1 +pr: 1 +match_op: 1 +match_exp: ^0([1-9][0-9]+)$ +match_len: 0 +subst_exp: ^0([1-9][0-9]+)$ +repl_exp: 0049\1 +attrs: xyz +... +dpid: 1 +pr: 1 +match_op: 1 +match_exp: ^0([1-9][0-9]+)$ +match_len: 0 +subst_exp: ^0(.+)$ +repl_exp: $var(prefix)\1 +attrs: xyz +... + </programlisting> + </example> + <para> + Note that you can use config variables in the replacement expression + (repl_exp) field. However, not all of config variables are safe to use + there - specifically the variables that have in their name other + variables (variables with dinamic name). References to sip message, + private variables ($var(...)) and AVPs with static name are among + those that are safe to use in replacement expressions. + </para> </section> </chapter>

1 0

preparing to release v3.2.0
by Daniel-Constantin Mierla 17 Oct '11

17 Oct '11

Hello, tomorrow is the day to release the new major version 3.2.0. Since involves creation of a new branch on GIT repository and some adjustments to the packaging, the plan is to start in the morning with the preparations. If any developer has something left to commit, please do it before 9:00am GMT. Afterwards it is very likely that the branch 3.2 will be created and there will be need for backport (which is fine as well). Then by 14:00 GMT the 3.2 branch should be frozen completely to start packaging the release. From than moment on until the release is announced, please send an email to sr-dev in case anyone wants to commit to branch 3.2. Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com Kamailio Advanced Training, Dec 5-8, Berlin: http://asipto.com/u/kat http://linkedin.com/in/miconda -- http://twitter.com/miconda

1 0

git:treimann/master_tm-extend-callbacks: tm: Add tm callback TMCB_RESPONSE_OUT, triggered when a
by Timo Reimann 17 Oct '11

17 Oct '11

Module: sip-router Branch: treimann/master_tm-extend-callbacks Commit: 843cf2f41e97566937fcf926333fd546c58fb0e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=843cf2f… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Oct 5 18:39:59 2011 +0200 tm: Add tm callback TMCB_RESPONSE_OUT, triggered when a non-retransmitted response is sent out. --- modules/tm/t_cancel.c | 2 ++ modules/tm/t_fwd.c | 6 +++++- modules/tm/t_hooks.h | 40 ++++++++++++++++++++++++---------------- modules/tm/t_reply.c | 3 ++- 4 files changed, 33 insertions(+), 18 deletions(-) diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index 8057ae4..7c225e8 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -327,6 +327,8 @@ int cancel_branch( struct cell *t, int branch, DBG("DEBUG: cancel_branch: sending cancel...\n"); if (SEND_BUFFER( crb )>=0){ + if (unlikely (has_tran_tmcbs(t, TMCB_REQUEST_OUT))) + run_trans_callbacks_with_buf(TMCB_REQUEST_OUT, crb, 0, 0, TMCB_LOCAL_F); if (unlikely (has_tran_tmcbs(t, TMCB_REQUEST_SENT))) run_trans_callbacks_with_buf(TMCB_REQUEST_SENT, crb, 0, 0, TMCB_LOCAL_F); } diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 819c831..604f1e3 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -1542,8 +1542,12 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , branch_ret=t_send_branch(t, i, p_msg , proxy, lock_replies); if (branch_ret>=0){ /* some kind of success */ - if (branch_ret==i) /* success */ + if (branch_ret==i) { /* success */ success_branch++; + if (unlikely(has_tran_tmcbs(t, TMCB_REQUEST_OUT))) + run_trans_callbacks_with_buf( TMCB_REQUEST_OUT, &t->uac[i].request, + p_msg, 0, -p_msg->REQ_METHOD); + } else /* new branch added */ added_branches |= 1<<branch_ret; } diff --git a/modules/tm/t_hooks.h b/modules/tm/t_hooks.h index 6f4dc08..b31558e 100644 --- a/modules/tm/t_hooks.h +++ b/modules/tm/t_hooks.h @@ -63,24 +63,25 @@ struct cell; #define TMCB_RESPONSE_FWDED_N 4 #define TMCB_ON_FAILURE_RO_N 5 #define TMCB_ON_FAILURE_N 6 -#define TMCB_RESPONSE_OUT_N 7 -#define TMCB_LOCAL_COMPLETED_N 8 -#define TMCB_LOCAL_RESPONSE_OUT_N 9 -#define TMCB_ACK_NEG_IN_N 10 -#define TMCB_REQ_RETR_IN_N 11 -#define TMCB_LOCAL_RESPONSE_IN_N 12 -#define TMCB_LOCAL_REQUEST_IN_N 13 -#define TMCB_DLG_N 14 -#define TMCB_DESTROY_N 15 /* called on transaction destroy */ -#define TMCB_E2ECANCEL_IN_N 16 -#define TMCB_E2EACK_RETR_IN_N 17 -#define TMCB_RESPONSE_READY_N 18 +#define TMCB_REQUEST_OUT_N 7 +#define TMCB_RESPONSE_OUT_N 8 +#define TMCB_LOCAL_COMPLETED_N 9 +#define TMCB_LOCAL_RESPONSE_OUT_N 10 +#define TMCB_ACK_NEG_IN_N 11 +#define TMCB_REQ_RETR_IN_N 12 +#define TMCB_LOCAL_RESPONSE_IN_N 13 +#define TMCB_LOCAL_REQUEST_IN_N 14 +#define TMCB_DLG_N 15 +#define TMCB_DESTROY_N 16 /* called on transaction destroy */ +#define TMCB_E2ECANCEL_IN_N 17 +#define TMCB_E2EACK_RETR_IN_N 18 +#define TMCB_RESPONSE_READY_N 19 #ifdef WITH_AS_SUPPORT -#define TMCB_DONT_ACK_N 19 /* TM shoudn't ACK a local UAC */ +#define TMCB_DONT_ACK_N 20 /* TM shoudn't ACK a local UAC */ #endif -#define TMCB_REQUEST_SENT_N 20 -#define TMCB_RESPONSE_SENT_N 21 -#define TMCB_MAX_N 21 +#define TMCB_REQUEST_SENT_N 21 +#define TMCB_RESPONSE_SENT_N 22 +#define TMCB_MAX_N 22 #define TMCB_REQUEST_IN (1<<TMCB_REQUEST_IN_N) @@ -90,6 +91,7 @@ struct cell; #define TMCB_RESPONSE_FWDED (1<<TMCB_RESPONSE_FWDED_N) #define TMCB_ON_FAILURE_RO (1<<TMCB_ON_FAILURE_RO_N) #define TMCB_ON_FAILURE (1<<TMCB_ON_FAILURE_N) +#define TMCB_REQUEST_OUT (1<<TMCB_REQUEST_OUT_N) #define TMCB_RESPONSE_OUT (1<<TMCB_RESPONSE_OUT_N) #define TMCB_LOCAL_COMPLETED (1<<TMCB_LOCAL_COMPLETED_N) #define TMCB_LOCAL_RESPONSE_OUT (1<<TMCB_LOCAL_RESPONSE_OUT_N) @@ -242,6 +244,12 @@ struct cell; * router (via t_relay/t_forward_nonack) and in this case the REPLY lock * will be held. * + * TMCB_REQUEST_OUT -- request was sent out successfully. + * There is nothing more you can change from the callback, it is good for + * accounting-like uses. + * Note: if the send fails or via cannot be resolved, this callback is + * _not_ called. + * * TMCB_LOCAL_COMPLETED -- final reply for localy initiated * transaction arrived. Message may be FAKED_REPLY. Can be called multiple * times, no lock is held. diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 69c55d9..fef5e0a 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -648,12 +648,13 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, } else { if (likely(SEND_PR_BUFFER( rb, buf, len )>=0)){ if (unlikely(code>=200 && !is_local(trans) && - has_tran_tmcbs(trans, TMCB_RESPONSE_OUT)) ) + has_tran_tmcbs(trans, TMCB_RESPONSE_OUT)) ){ INIT_TMCB_ONSEND_PARAMS(onsend_params, trans->uas.request, FAKED_REPLY, rb, &rb->dst, buf, len, TMCB_LOCAL_F, rb->branch, code); run_trans_callbacks_off_params(TMCB_RESPONSE_OUT, trans, &onsend_params); + } if (unlikely(has_tran_tmcbs(trans, TMCB_RESPONSE_SENT))){ INIT_TMCB_ONSEND_PARAMS(onsend_params, trans->uas.request, FAKED_REPLY, rb, &rb->dst,

1 0

git:treimann/master_tm-extend-callbacks: tm: Add tm callback TMCB_REQUEST_PENDING, triggered when a
by Timo Reimann 17 Oct '11

17 Oct '11

Module: sip-router Branch: treimann/master_tm-extend-callbacks Commit: d21983e8625a504a918af2b9acc9134cef89f0b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d21983e… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Oct 5 18:39:59 2011 +0200 tm: Add tm callback TMCB_REQUEST_PENDING, triggered when a 100/Trying is sent out. --- modules/tm/t_hooks.h | 44 +++++++++++++++++++++++--------------------- modules/tm/t_reply.c | 6 ++++++ 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/modules/tm/t_hooks.h b/modules/tm/t_hooks.h index b31558e..37ae4b8 100644 --- a/modules/tm/t_hooks.h +++ b/modules/tm/t_hooks.h @@ -59,34 +59,36 @@ struct cell; #define TMCB_REQUEST_IN_N 0 #define TMCB_RESPONSE_IN_N 1 #define TMCB_E2EACK_IN_N 2 -#define TMCB_REQUEST_FWDED_N 3 -#define TMCB_RESPONSE_FWDED_N 4 -#define TMCB_ON_FAILURE_RO_N 5 -#define TMCB_ON_FAILURE_N 6 -#define TMCB_REQUEST_OUT_N 7 -#define TMCB_RESPONSE_OUT_N 8 -#define TMCB_LOCAL_COMPLETED_N 9 -#define TMCB_LOCAL_RESPONSE_OUT_N 10 -#define TMCB_ACK_NEG_IN_N 11 -#define TMCB_REQ_RETR_IN_N 12 -#define TMCB_LOCAL_RESPONSE_IN_N 13 -#define TMCB_LOCAL_REQUEST_IN_N 14 -#define TMCB_DLG_N 15 -#define TMCB_DESTROY_N 16 /* called on transaction destroy */ -#define TMCB_E2ECANCEL_IN_N 17 -#define TMCB_E2EACK_RETR_IN_N 18 -#define TMCB_RESPONSE_READY_N 19 +#define TMCB_REQUEST_PENDING_N 3 +#define TMCB_REQUEST_FWDED_N 4 +#define TMCB_RESPONSE_FWDED_N 5 +#define TMCB_ON_FAILURE_RO_N 6 +#define TMCB_ON_FAILURE_N 7 +#define TMCB_REQUEST_OUT_N 8 +#define TMCB_RESPONSE_OUT_N 9 +#define TMCB_LOCAL_COMPLETED_N 10 +#define TMCB_LOCAL_RESPONSE_OUT_N 11 +#define TMCB_ACK_NEG_IN_N 12 +#define TMCB_REQ_RETR_IN_N 13 +#define TMCB_LOCAL_RESPONSE_IN_N 14 +#define TMCB_LOCAL_REQUEST_IN_N 15 +#define TMCB_DLG_N 16 +#define TMCB_DESTROY_N 17 /* called on transaction destroy */ +#define TMCB_E2ECANCEL_IN_N 18 +#define TMCB_E2EACK_RETR_IN_N 19 +#define TMCB_RESPONSE_READY_N 20 #ifdef WITH_AS_SUPPORT -#define TMCB_DONT_ACK_N 20 /* TM shoudn't ACK a local UAC */ +#define TMCB_DONT_ACK_N 21 /* TM shoudn't ACK a local UAC */ #endif -#define TMCB_REQUEST_SENT_N 21 -#define TMCB_RESPONSE_SENT_N 22 -#define TMCB_MAX_N 22 +#define TMCB_REQUEST_SENT_N 22 +#define TMCB_RESPONSE_SENT_N 23 +#define TMCB_MAX_N 23 #define TMCB_REQUEST_IN (1<<TMCB_REQUEST_IN_N) #define TMCB_RESPONSE_IN (1<<TMCB_RESPONSE_IN_N) #define TMCB_E2EACK_IN (1<<TMCB_E2EACK_IN_N) +#define TMCB_REQUEST_PENDING (1<<TMCB_REQUEST_PENDING_N) #define TMCB_REQUEST_FWDED (1<<TMCB_REQUEST_FWDED_N) #define TMCB_RESPONSE_FWDED (1<<TMCB_RESPONSE_FWDED_N) #define TMCB_ON_FAILURE_RO (1<<TMCB_ON_FAILURE_RO_N) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index fef5e0a..c2021e7 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -632,6 +632,12 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, start_final_repl_retr( trans ); } + if (code==100) { + if(unlikely(has_tran_tmcbs(trans, TMCB_REQUEST_PENDING))) + run_trans_callbacks_with_buf(TMCB_REQUEST_PENDING, rb, + trans->uas.request, FAKED_REPLY, code); + } + /* send it out */ /* first check if we managed to resolve topmost Via -- if not yet, don't try to retransmit

1 0

git:treimann/master_tm-extend-callbacks: tm: Provide sent buffer ( processed message) in callback to
by Timo Reimann 17 Oct '11

17 Oct '11

Module: sip-router Branch: treimann/master_tm-extend-callbacks Commit: ebab1db04c51d38fda19eb7f31955e3c52fcb877 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ebab1db… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Oct 5 18:39:59 2011 +0200 tm: Provide sent buffer (processed message) in callback to TMCB_RESPONSE_READY. --- modules/tm/t_reply.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 1a11038..69c55d9 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -617,7 +617,7 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, 0, FAKED_REPLY, code); } else { if(unlikely(has_tran_tmcbs(trans, TMCB_RESPONSE_READY))) { - run_trans_callbacks(TMCB_RESPONSE_READY, trans, + run_trans_callbacks_with_buf(TMCB_RESPONSE_READY, rb, trans->uas.request, FAKED_REPLY, code); } } @@ -1806,7 +1806,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, /* send it now (from the private buffer) */ if (relay >= 0) { if (unlikely(!totag_retr && has_tran_tmcbs(t, TMCB_RESPONSE_READY))){ - run_trans_callbacks(TMCB_RESPONSE_READY, t, + run_trans_callbacks_with_buf(TMCB_RESPONSE_READY, uas_rb, t->uas.request, relayed_msg, relayed_code); } /* Set retransmission timer before the reply is sent out to avoid

1 0

git:treimann/master_tm-extend-callbacks: tm: Provide sent buffer ( processed message) in callback to
by Timo Reimann 17 Oct '11

17 Oct '11

Module: sip-router Branch: treimann/master_tm-extend-callbacks Commit: 9f0e2ebebc9acb10bb92e695c30c74286296c80d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f0e2eb… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Oct 5 11:15:04 2011 +0200 tm: Provide sent buffer (processed message) in callback to TMCB_RESPONSE_OUT. --- modules/tm/t_reply.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 50ef8c9..1a11038 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -649,8 +649,11 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, if (likely(SEND_PR_BUFFER( rb, buf, len )>=0)){ if (unlikely(code>=200 && !is_local(trans) && has_tran_tmcbs(trans, TMCB_RESPONSE_OUT)) ) - run_trans_callbacks(TMCB_RESPONSE_OUT, trans, - trans->uas.request, FAKED_REPLY, code); + INIT_TMCB_ONSEND_PARAMS(onsend_params, trans->uas.request, + FAKED_REPLY, rb, &rb->dst, + buf, len, TMCB_LOCAL_F, rb->branch, code); + run_trans_callbacks_off_params(TMCB_RESPONSE_OUT, trans, + &onsend_params); if (unlikely(has_tran_tmcbs(trans, TMCB_RESPONSE_SENT))){ INIT_TMCB_ONSEND_PARAMS(onsend_params, trans->uas.request, FAKED_REPLY, rb, &rb->dst, @@ -1820,8 +1823,8 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if (likely(uas_rb->dst.send_sock && SEND_PR_BUFFER( uas_rb, buf, res_len ) >= 0)){ if (unlikely(!totag_retr && has_tran_tmcbs(t, TMCB_RESPONSE_OUT))){ - run_trans_callbacks( TMCB_RESPONSE_OUT, t, t->uas.request, - relayed_msg, relayed_code); + run_trans_callbacks_with_buf( TMCB_RESPONSE_OUT, uas_rb, t->uas.request, + relayed_msg, relayed_code); } if (unlikely(has_tran_tmcbs(t, TMCB_RESPONSE_SENT))){ INIT_TMCB_ONSEND_PARAMS(onsend_params, t->uas.request,

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2011