sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: tm: internal t_reply exported via API

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9795ed48d9fa1a65287c55c18d61fb6b4c627773 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9795ed4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 11 15:00:42 2010 +0200 tm: internal t_reply exported via API - internal t_reply exported as t_reply_trans - it takes transaction pointer as parameter - removed duplicate include of t_reply.h --- modules/tm/t_reply.h | 2 ++ modules/tm/tm_load.c | 1 + modules/tm/tm_load.h | 2 +- 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_reply.h b/modules/tm/t_reply.h index b798fa1..a348ccd 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -71,6 +71,8 @@ typedef int (*treply_f)(struct sip_msg * , unsigned int , char * ); typedef int (*treply_wb_f)( struct cell* trans, unsigned int code, char * text, char * body, char * new_header, char * to_tag); +typedef int (*treply_trans_f)(struct cell *t, struct sip_msg* p_msg, unsigned int code, + char * text); /* wrapper function needed after changes in w_t_reply */ int w_t_reply_wrp(struct sip_msg *m, unsigned int code, char *txt); diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index 078329f..0b19ad2 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -87,6 +87,7 @@ int load_tm( struct tm_binds *tmb) tmb->register_tmcb =register_tmcb; tmb->t_reply = w_t_reply_wrp; tmb->t_reply_with_body = t_reply_with_body; + tmb->t_reply_trans = t_reply; tmb->t_is_local = t_is_local; tmb->t_get_trans_ident = t_get_trans_ident; tmb->t_lookup_ident = t_lookup_ident; diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index e7c0fa9..2d4b6f6 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -43,7 +43,6 @@ #include "t_hooks.h" #include "uac.h" #include "t_fwd.h" -#include "t_reply.h" #include "t_lookup.h" #include "t_reply.h" #include "dlg.h" @@ -68,6 +67,7 @@ struct tm_binds { tlookup_ident_f t_lookup_ident; taddblind_f t_addblind; treply_f t_reply_unsafe; + treply_trans_f t_reply_trans; tfwd_f t_forward_nonack; reqwith_t t_request_within; reqout_t t_request_outside;

14 years, 9 months

git:sr_3.0: modules/mediaproxy: removed error message

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: f955f63ada7032f5e530f7652232e4fb040d29f1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f955f63… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue May 11 14:43:55 2010 +0300 modules/mediaproxy: removed error message - Removed error message since a=rtcp line could contain the port only. Credits to Thomas Gelf and Saul Ibarra Corretge. --- modules/mediaproxy/mediaproxy.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c index 4b314af..35c652f 100644 --- a/modules/mediaproxy/mediaproxy.c +++ b/modules/mediaproxy/mediaproxy.c @@ -893,7 +893,6 @@ get_rtcp_ip_attribute(str *block) count = get_str_tokens(&zone, tokens, 4); if (count != 4) { - LM_ERR("invalid `a=rtcp' line in SDP body\n"); return undefined; }

14 years, 9 months

git:kamailio_3.0: modules/mediaproxy: removed error message

by Juha Heinanen

Module: sip-router Branch: kamailio_3.0 Commit: 9ba3305c3e813531200da6b03f72676c930e784d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9ba3305… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue May 11 14:43:55 2010 +0300 modules/mediaproxy: removed error message - Removed error message since a=rtcp line could contain the port only. Credits to Thomas Gelf and Saul Ibarra Corretge. --- modules/mediaproxy/mediaproxy.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c index 4b314af..35c652f 100644 --- a/modules/mediaproxy/mediaproxy.c +++ b/modules/mediaproxy/mediaproxy.c @@ -893,7 +893,6 @@ get_rtcp_ip_attribute(str *block) count = get_str_tokens(&zone, tokens, 4); if (count != 4) { - LM_ERR("invalid `a=rtcp' line in SDP body\n"); return undefined; }

14 years, 9 months

git:master: modules/mediaproxy: removed error message

by Juha Heinanen

Module: sip-router Branch: master Commit: f194caed3ca7a10bc90bf08a2324ccbfe78b3c94 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f194cae… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue May 11 14:43:55 2010 +0300 modules/mediaproxy: removed error message - Removed error message since a=rtcp line could contain the port only. Credits to Thomas Gelf and Saul Ibarra Corretge. --- modules/mediaproxy/mediaproxy.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c index d55b776..732395d 100644 --- a/modules/mediaproxy/mediaproxy.c +++ b/modules/mediaproxy/mediaproxy.c @@ -907,7 +907,6 @@ get_rtcp_ip_attribute(str *block) count = get_str_tokens(&zone, tokens, 4); if (count != 4) { - LM_ERR("invalid `a=rtcp' line in SDP body\n"); return undefined; }

14 years, 9 months

git:sr_3.0: modules_k/permissions: backported address table reload fix from master

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: c8390476a7d30a0352beeb434920947730965a53 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c839047… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun May 9 15:55:22 2010 +0300 modules_k/permissions: backported address table reload fix from master --- modules_k/permissions/address.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index 126c8d8..63c0cf1 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -78,6 +78,17 @@ int reload_address_table(void) cols[2] = &mask_col; cols[3] = &port_col; + if (db_handle) { + LM_ERR("db_handle already exists\n"); + return -1; + } + + db_handle = perm_dbf.init(&db_url); + if (!db_handle) { + LM_ERR("unable to connect database\n"); + return -1; + } + if (perm_dbf.use_table(db_handle, &address_table) < 0) { LM_ERR("failed to use table\n"); return -1; @@ -161,6 +172,9 @@ int reload_address_table(void) perm_dbf.free_result(db_handle, res); + perm_dbf.close(db_handle); + db_handle = 0; + *addr_hash_table = new_hash_table; *subnet_table = new_subnet_table; @@ -203,9 +217,13 @@ int init_addresses(void) if(db_check_table_version(&perm_dbf, db_handle, &address_table, TABLE_VERSION) < 0) { LM_ERR("error during table version check.\n"); perm_dbf.close(db_handle); + db_handle = 0; return -1; } + perm_dbf.close(db_handle); + db_handle = 0; + addr_hash_table_1 = new_addr_hash_table(); if (!addr_hash_table_1) return -1; @@ -234,9 +252,6 @@ int init_addresses(void) goto error; } - perm_dbf.close(db_handle); - db_handle = 0; - return 0; error: @@ -265,8 +280,6 @@ error: shm_free(subnet_table); subnet_table = 0; } - perm_dbf.close(db_handle); - db_handle = 0; return -1; }

14 years, 9 months

git:kamailio_3.0: modules_k/permissions: backported address table reload fix from master

by Juha Heinanen

Module: sip-router Branch: kamailio_3.0 Commit: b0091da84ee5bbbc18cb799eefc497be707ab0f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0091da… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun May 9 15:55:22 2010 +0300 modules_k/permissions: backported address table reload fix from master --- modules_k/permissions/address.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index 126c8d8..63c0cf1 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -78,6 +78,17 @@ int reload_address_table(void) cols[2] = &mask_col; cols[3] = &port_col; + if (db_handle) { + LM_ERR("db_handle already exists\n"); + return -1; + } + + db_handle = perm_dbf.init(&db_url); + if (!db_handle) { + LM_ERR("unable to connect database\n"); + return -1; + } + if (perm_dbf.use_table(db_handle, &address_table) < 0) { LM_ERR("failed to use table\n"); return -1; @@ -161,6 +172,9 @@ int reload_address_table(void) perm_dbf.free_result(db_handle, res); + perm_dbf.close(db_handle); + db_handle = 0; + *addr_hash_table = new_hash_table; *subnet_table = new_subnet_table; @@ -203,9 +217,13 @@ int init_addresses(void) if(db_check_table_version(&perm_dbf, db_handle, &address_table, TABLE_VERSION) < 0) { LM_ERR("error during table version check.\n"); perm_dbf.close(db_handle); + db_handle = 0; return -1; } + perm_dbf.close(db_handle); + db_handle = 0; + addr_hash_table_1 = new_addr_hash_table(); if (!addr_hash_table_1) return -1; @@ -234,9 +252,6 @@ int init_addresses(void) goto error; } - perm_dbf.close(db_handle); - db_handle = 0; - return 0; error: @@ -265,8 +280,6 @@ error: shm_free(subnet_table); subnet_table = 0; } - perm_dbf.close(db_handle); - db_handle = 0; return -1; }

14 years, 9 months

git:kamailio_3.0: avposp: use state in searching first avp in avp_copy

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 59894cc9d53b03494753a00c4057c595afc3e5c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59894cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 6 21:09:47 2010 +0200 avposp: use state in searching first avp in avp_copy - state parameter was missing when searching first avp, keeping it uninitialized when searching the next, causing a crash when flag 'g' was used in avp_copy - reported by Jon Bonilla (Manwe) (cherry picked from commit 027d68e9cc7afcdb3ba8922215a28e33a5225097) --- modules/avpops/avpops_impl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index 3817cd8..77de8a8 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -842,7 +842,7 @@ int ops_copy_avp( struct sip_msg* msg, struct fis_param* src, goto error; } - avp = search_first_avp( name_type1, avp_name1, &avp_val, 0); + avp = search_first_avp( name_type1, avp_name1, &avp_val, &st); while ( avp ) { /* build a new avp with new name, but old value */

14 years, 9 months

git:master: avposp: use state in searching first avp in avp_copy

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 027d68e9cc7afcdb3ba8922215a28e33a5225097 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=027d68e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 6 21:09:47 2010 +0200 avposp: use state in searching first avp in avp_copy - state parameter was missing when searching first avp, keeping it uninitialized when searching the next, causing a crash when flag 'g' was used in avp_copy - reported by Jon Bonilla (Manwe) --- modules/avpops/avpops_impl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index 3817cd8..77de8a8 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -842,7 +842,7 @@ int ops_copy_avp( struct sip_msg* msg, struct fis_param* src, goto error; } - avp = search_first_avp( name_type1, avp_name1, &avp_val, 0); + avp = search_first_avp( name_type1, avp_name1, &avp_val, &st); while ( avp ) { /* build a new avp with new name, but old value */

14 years, 9 months

git:master: tm: use direct assignment to exported API

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f045c756a0e1da83526e709559e4287a62a0fdfe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f045c75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 6 20:49:43 2010 +0200 tm: use direct assignment to exported API - non-cfg functions are exported via direct assignment, they do not follow cfg command prototype --- modules/tm/tm.c | 33 --------- modules/tm/tm_load.c | 185 +++++++++++--------------------------------------- 2 files changed, 39 insertions(+), 179 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f04…

14 years, 9 months

git:master: tm: removed the defines of cfg and api functions

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: de804eab627b01bab5f7872bc6a0bd281c5ab62a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de804ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 6 20:17:08 2010 +0200 tm: removed the defines of cfg and api functions --- modules/tm/tm.c | 46 +++++++++++++++++++++++----------------------- modules/tm/tm_load.c | 22 +++++++++++----------- modules/tm/tm_load.h | 26 -------------------------- 3 files changed, 34 insertions(+), 60 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=de8…

14 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev