sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: modules_k/*: add missing lib/kmi/mi.h include

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 65f879ee58a6881eb95ff6fde062498e786115c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65f879e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 18 19:58:44 2010 +0200 modules_k/*: add missing lib/kmi/mi.h include --- modules/matrix/matrix.c | 2 +- modules/pdb/pdb.c | 1 + modules_k/pua_mi/pua_mi.c | 1 + modules_k/rtpproxy/rtpproxy.c | 2 +- modules_k/tmx/t_mi.c | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/matrix/matrix.c b/modules/matrix/matrix.c index 05c8f82..3c921c3 100644 --- a/modules/matrix/matrix.c +++ b/modules/matrix/matrix.c @@ -24,7 +24,7 @@ #include "../../mem/shm_mem.h" #include "../../sr_module.h" -#include "../../mi/mi.h" +#include "../../lib/kmi/mi.h" #include "../../mem/mem.h" #include "../../usr_avp.h" #include "../../locking.h" diff --git a/modules/pdb/pdb.c b/modules/pdb/pdb.c index 721363c..5ae47f3 100644 --- a/modules/pdb/pdb.c +++ b/modules/pdb/pdb.c @@ -29,6 +29,7 @@ #include "../../sr_module.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" +#include "../../lib/kmi/mi.h" #include <sys/time.h> #include <poll.h> #include <stdlib.h> diff --git a/modules_k/pua_mi/pua_mi.c b/modules_k/pua_mi/pua_mi.c index a6ab82c..c78d4f4 100644 --- a/modules_k/pua_mi/pua_mi.c +++ b/modules_k/pua_mi/pua_mi.c @@ -40,6 +40,7 @@ #include "../../mem/mem.h" #include "../../pt.h" #include "../../modules/tm/tm_load.h" +#include "../../lib/kmi/mi.h" #include "../pua/pua_bind.h" #include "mi_func.h" diff --git a/modules_k/rtpproxy/rtpproxy.c b/modules_k/rtpproxy/rtpproxy.c index 4303844..595cfdc 100644 --- a/modules_k/rtpproxy/rtpproxy.c +++ b/modules_k/rtpproxy/rtpproxy.c @@ -209,7 +209,7 @@ #include "../../ut.h" #include "../../pt.h" #include "../../timer_proc.h" -#include "../../lib/kmi/attr.h" +#include "../../lib/kmi/mi.h" #include "../../lib/kcore/km_ut.h" #include "../../lib/kcore/parser_helpers.h" #include "../../pvar.h" diff --git a/modules_k/tmx/t_mi.c b/modules_k/tmx/t_mi.c index 44c5054..405ed88 100644 --- a/modules_k/tmx/t_mi.c +++ b/modules_k/tmx/t_mi.c @@ -37,6 +37,7 @@ #include <stdlib.h> #include "../../parser/parse_from.h" #include "../../modules/tm/ut.h" +#include "../../lib/kmi/mi.h" #include "tmx_mod.h" /*! simple string list */

14 years, 5 months

git:master: modules*: add k stats. includes where needed

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 4380fb9b63d58462f67ea972467556064b7cf0bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4380fb9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 18 20:06:25 2010 +0200 modules*: add k stats. includes where needed Add k statistics includes (../../lib/kcore/kstats_wrapper.h) for modules using k statistics and missing them (needed after no longer automatically including k stats via sr_module.h) --- modules/sl/sl_stats.c | 1 + modules_k/dialog/dialog.c | 1 + modules_k/dialog/dlg_req_within.c | 1 + modules_k/snmpstats/snmpSIPStatusCodesTable.c | 1 + modules_k/tmx/tmx_mod.c | 1 + 5 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/sl/sl_stats.c b/modules/sl/sl_stats.c index ab55134..7b3ff53 100644 --- a/modules/sl/sl_stats.c +++ b/modules/sl/sl_stats.c @@ -33,6 +33,7 @@ #include "../../config.h" #include "../../pt.h" #include "sl_stats.h" +#include "../../lib/kcore/kstats_wrapper.h" #include <strings.h> #include <stdio.h> diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 0ca60b4..8cada91 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -53,6 +53,7 @@ #include "../../script_cb.h" #include "../../lib/kcore/faked_msg.h" #include "../../lib/kcore/hash_func.h" +#include "../../lib/kcore/kstats_wrapper.h" #include "../../mem/mem.h" #include "../../lib/kmi/mi.h" #include "../../lvalue.h" diff --git a/modules_k/dialog/dlg_req_within.c b/modules_k/dialog/dlg_req_within.c index 3b6c57d..7d50926 100644 --- a/modules_k/dialog/dlg_req_within.c +++ b/modules_k/dialog/dlg_req_within.c @@ -38,6 +38,7 @@ #include "../../modules/tm/tm_load.h" #include "../../lib/kmi/tree.h" #include "../../lib/kcore/km_ut.h" +#include "../../lib/kcore/kstats_wrapper.h" #include "dlg_timer.h" #include "dlg_hash.h" #include "dlg_req_within.h" diff --git a/modules_k/snmpstats/snmpSIPStatusCodesTable.c b/modules_k/snmpstats/snmpSIPStatusCodesTable.c index eda8fbc..6686c05 100644 --- a/modules_k/snmpstats/snmpSIPStatusCodesTable.c +++ b/modules_k/snmpstats/snmpSIPStatusCodesTable.c @@ -84,6 +84,7 @@ #include "snmpSIPStatusCodesTable.h" #include "snmpstats_globals.h" +#include "../../lib/kcore/statistics.h" static netsnmp_handler_registration *my_handler = NULL; static netsnmp_table_array_callbacks cb; diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index 3714fed..6e6f758 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -28,6 +28,7 @@ #include "../../dprint.h" #include "../../mod_fix.h" #include "../../modules/tm/tm_load.h" +#include "../../lib/kcore/kstats_wrapper.h" #include "t_var.h" #include "t_mi.h"

14 years, 5 months

git:master: kstats: cleanup - move type defs. to separate file

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 742ce3ae28a4d1294ce0b7f63f0bc0968bff8ea3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=742ce3a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 18 20:01:31 2010 +0200 kstats: cleanup - move type defs. to separate file - moved kamailio statistics type defs to kstats_types.h (from lib/kcore/kstats_wrapper.h). This removes core dependency on lib/kcore include files (the statistics types are needed for the kamailio module interface defs). - removed statistics.h (it is obsolete, counters.h should be used instead and if somebody really needs it, it should include lib/kcore/kstats_wrapper.h or lib/kcore/statistics.h). --- kstats_types.h | 69 ++++++++++++++++++++++++++++++++++++++++++++ lib/kcore/kstats_wrapper.h | 27 ++--------------- sr_module.h | 2 +- statistics.h | 33 --------------------- 4 files changed, 73 insertions(+), 58 deletions(-) diff --git a/kstats_types.h b/kstats_types.h new file mode 100644 index 0000000..b8d1629 --- /dev/null +++ b/kstats_types.h @@ -0,0 +1,69 @@ +/* + * $Id$ + * + * Copyright (C) 2010 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/** kamailio statistics types. + * This file contains type declaration for kamailio statistics. + * They are needed when modules are loaded (sr_module.c). + * The rest of kamailio stats are in lib/kcore (include + * lib/kcore/kstats_wrapper.h or lib/kcore/statistics.h and link with + * libkcore). + * Note: kamailio statistics are obsolete. Use sr counters in new code + * (counters.h). + * @file kstats_types.h + * @ingroup: core + */ +/* + * History: + * -------- + * 2010-08-18 initial version (andrei) +*/ + +#ifndef __kstats_types_h +#define __kstats_types_h + +#include "counters.h" + +/* types */ + +typedef counter_val_t stat_val; +/* stat_var is always used as a pointer in k, we missuse + stat_var* for holding out counter id */ +typedef void stat_var; +/* get val callback + * TODO: change it to counter_cbk_f compatible callback? + */ +typedef counter_val_t (*stat_function)(void); + +/* statistic module interface */ +struct stat_export_s { + char* name; + int flags; + stat_var** stat_pointer; /* pointer to the memory location + (where a counter handle will be stored) + Note: it's a double pointer because of + the original k version which needed it + allocated in shm. This version + will store the counter id at *stat_pointer. + */ +}; + +typedef struct stat_export_s stat_export_t; + + +#endif /*__kstats_types_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/lib/kcore/kstats_wrapper.h b/lib/kcore/kstats_wrapper.h index 1d6ba47..1c9559b 100644 --- a/lib/kcore/kstats_wrapper.h +++ b/lib/kcore/kstats_wrapper.h @@ -35,12 +35,15 @@ * History: * -------- * 2010-08-08 initial version (andrei) + * 2010-08-18 type declaration needed by sr_module.c moved to + * ../../kstats_types.h (andrei) */ #ifndef __kstats_wrapper_h #define __kstats_wrapper_h #include "../../counters.h" +#include "../../kstats_types.h" /* k stat flags */ #define STAT_NO_RESET 1 /* used in dialog(k), nat_traversal(k), @@ -49,31 +52,7 @@ #define STAT_SHM_NAME 4 /* used only from usrloc(k) */ #define STAT_IS_FUNC 8 -/* types */ -typedef counter_val_t stat_val; -/* stat_var is always used as a pointer in k, we missuse - stat_var* for holding out counter id */ -typedef void stat_var; -/* get val callback - * TODO: change it to counter_cbk_f compatible callback? - */ -typedef counter_val_t (*stat_function)(void); - -/* statistic module interface */ -struct stat_export_s { - char* name; - int flags; - stat_var** stat_pointer; /* pointer to the memory location - (where a counter handle will be stored) - Note: it's a double pointer because of - the original k version which needed it - allocated in shm. This version - will store the counter id at *stat_pointer. - */ -}; - -typedef struct stat_export_s stat_export_t; #ifdef STATISTICS diff --git a/sr_module.h b/sr_module.h index baf1081..4d32514 100644 --- a/sr_module.h +++ b/sr_module.h @@ -68,7 +68,7 @@ #include "str.h" /* kamailio compat */ -#include "statistics.h" +#include "kstats_types.h" #include "mi/mi_types.h" #include "pvar.h" diff --git a/statistics.h b/statistics.h deleted file mode 100644 index e9e430a..0000000 --- a/statistics.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * $Id$ - * - * Copyright (C) 2008 iptelorg GmbH - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -/* - * statistics compatibility wrapper for kamailio - * for now it doesn't do anything - * (obsolete, do not use anymore) - * - * History: - * -------- - * 2008-11-17 initial version compatible with kamailio statistics.h (andrei) - */ - -#ifndef _STATISTICS_H_ -#define _STATISTICS_H_ - -#include "lib/kcore/statistics.h" - -#endif /* _STATISTICS_H_ */

14 years, 5 months

git:master: tcp: fix double increment for the established stats

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 66cda7bc5f642ce892124cfb35f1e5effd78e9d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=66cda7b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 18 18:36:14 2010 +0200 tcp: fix double increment for the established stats The counter/stats for established TCP connections were incremented twice in the case of accept()-ed connections: once immediately after the accept() and another time after the first packet received or sent on the connection. Now they are incremented only after the first successful send or receive. --- tcp_main.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index a1761f6..31fc0fa 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -3973,7 +3973,15 @@ static inline int handle_new_connect(struct socket_info* si) return 1; /* success, because the accept was succesfull */ } (*tcp_connections_no)++; - TCP_STATS_ESTABLISHED(S_CONN_ACCEPT); + /* stats for established connections are incremented after + the first received or sent packet. + Alternatively they could be incremented here for accepted + connections, but then the connection state must be changed to + S_CONN_OK: + TCP_STATS_ESTABLISHED(S_CONN_ACCEPT); + ... + tcpconn=tcpconn_new(new_sock, &su, dst_su, si, si->proto, S_CONN_OK); + */ dst_su=&si->su; if (unlikely(si->flags & SI_IS_ANY)){

14 years, 5 months

git:master: tm: don't reply if the reply dest. is not yet set

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 96e1bc629bc7ed78dd64b221bc54b266cd45e3ca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96e1bc6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 18 18:39:43 2010 +0200 tm: don't reply if the reply dest. is not yet set - relay_reply() doesn't attempt to send the reply if the reply destination is not yet fully set. This can happen for example if reply_to_via is set, Via contains a host name (and not an ip) and before having a chance to resolve the name a reply must be sent (reply for a message that hasn't been sent yet: very unlikely, but possible). - use a membar_write() in init_rb(), before setting the reply send socket (the reply send socket is also used as a flag for a fully initialized reply destination and the membar_write() makes sure that everything else was written before the send socket and no re-ordering will take place). --- modules/tm/t_lookup.c | 17 ++--------------- modules/tm/t_reply.c | 8 +++++--- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/modules/tm/t_lookup.c b/modules/tm/t_lookup.c index b0ddfa6..e69fdec 100644 --- a/modules/tm/t_lookup.c +++ b/modules/tm/t_lookup.c @@ -1196,7 +1196,6 @@ int init_rb( struct retr_buf *rb, struct sip_msg *msg) /*struct socket_info* send_sock;*/ struct via_body* via; int proto; - int backup_mhomed; /* rb. timers are init. init_t()/new_cell() */ via=msg->via1; @@ -1220,20 +1219,8 @@ int init_rb( struct retr_buf *rb, struct sip_msg *msg) rb->dst.comp=via->comp_no; #endif rb->dst.send_flags=msg->rpl_send_flags; - /* turn off mhomed for generating replies -- they are ideally sent to where - request came from to make life with NATs and other beasts easier - */ - backup_mhomed=mhomed; - mhomed=0; - mhomed=backup_mhomed; - /* use for sending replies the incoming interface of the request -bogdan */ - /*send_sock=get_send_socket(msg, &rb->dst.to, proto); - if (send_sock==0) { - LOG(L_ERR, "ERROR: init_rb: cannot fwd to af %d, proto %d " - "no socket\n", rb->dst.to.s.sa_family, proto); - ser_error=E_BAD_VIA; - return 0; - }*/ + + membar_write(); rb->dst.send_sock=msg->rcv.bind_address; return 1; } diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index df372e1..1a90844 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -637,7 +637,7 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, If reply_to_via is set and via contains a host name (and not an ip) the chances for this increase a lot. */ - if (!trans->uas.response.dst.send_sock) { + if (unlikely(!trans->uas.response.dst.send_sock)) { LOG(L_ERR, "ERROR: _reply_light: no resolved dst to send reply to\n"); } else { if (likely(SEND_PR_BUFFER( rb, buf, len )>=0)){ @@ -1786,7 +1786,8 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if (reply_status == RPS_COMPLETED) { start_final_repl_retr(t); } - if (SEND_PR_BUFFER( uas_rb, buf, res_len )>=0){ + 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); @@ -1801,7 +1802,8 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, run_onsend_callbacks2(TMCB_RESPONSE_SENT, t, &onsend_params); } #endif - } + } else if (unlikely(uas_rb->dst.send_sock == 0)) + ERR("no resolved dst to send reply to\n"); /* Call put_on_wait() only if we really send out * the reply. It can happen that the reply has been already sent from * failure_route or from a callback and the timer has been already

14 years, 5 months

git:kamailio_3.0: pdbt: fix two bugs in debian packaging

by Henning Westerholt

Module: sip-router Branch: kamailio_3.0 Commit: edde2d53d60f5174cc91a01daae92fdbb2b49d56 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=edde2d5… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Aug 18 13:45:37 2010 +0200 pdbt: fix two bugs in debian packaging (cherry picked from commit cd71125fcdb434d50f6e7b5d208d260ebc49fca6) --- utils/pdbt/debian/changelog | 2 +- utils/pdbt/debian/rules | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/pdbt/debian/changelog b/utils/pdbt/debian/changelog index a919ba5..353250a 100644 --- a/utils/pdbt/debian/changelog +++ b/utils/pdbt/debian/changelog @@ -2,4 +2,4 @@ pdbt (0.0.1) etch; urgency=low * initial release - -- Henning Westerholt <henning.westerholt(a)1und1.de> Wed, 09 Sep 2009 18:07:30 -- +0200 + -- Henning Westerholt <henning.westerholt(a)1und1.de> Wed, 09 Sep 2009 18:07:30 +0200 diff --git a/utils/pdbt/debian/rules b/utils/pdbt/debian/rules index d902dea..3df7d25 100755 --- a/utils/pdbt/debian/rules +++ b/utils/pdbt/debian/rules @@ -56,7 +56,9 @@ install: build dh_installdirs # Add here commands to install the package into debian/ui-pdbt. - $(MAKE) install DESTDIR=$(CURDIR)/debian/ui-pdbt + mkdir -p $(CURDIR)/debian/pdbt/usr/bin + mkdir -p $(CURDIR)/debian/pdbt/etc + $(MAKE) install DESTDIR=$(CURDIR)/debian/pdbt # Build architecture-independent files here.

14 years, 5 months

git:master: pua: updated devel API documentation

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: bb5d5155daefe654f1998f61c3a92c07830d9204 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb5d515… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 18 17:21:14 2010 +0200 pua: updated devel API documentation - updated documentation to reflect latest source code - patch by Nikita Kozlov --- modules_k/pua/README | 18 ++++++++---------- modules_k/pua/doc/pua_devel.xml | 22 +++++++++------------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/modules_k/pua/README b/modules_k/pua/README index 97a00bc..99f832a 100644 --- a/modules_k/pua/README +++ b/modules_k/pua/README @@ -344,18 +344,9 @@ typedef struct publ_info should match */ str* extra_headers /* (optional) extra_headers that should be added to Publish msg*/ - publrpl_cb_t* cbrpl;/* callback function to be called when receiving - the reply for the sent request */ - void* cbparam; /* extra parameter for tha callback function */ - }publ_info_t; ... - The callback function type: -... -typedef int (publrpl_cb_t)(struct sip_msg* reply, void* extra_param); -... - 3. send_subscribe Field type: @@ -422,7 +413,7 @@ typedef int (*register_puacb_t)(int types, pua_cb f, void* param ); ... This function registers a callback to be called on receiving the reply - message for a sent Subscribe request. The type parameter should be set + message for a sent Publish or Subscribe request. The type parameter should be set the same as the source_flag for that request. The function registered as callback for pua should be of type pua_cb , which is: typedef void (pua_cb)(ua_pres_t* hentity, struct msg_start * fl); The parameters are @@ -438,6 +429,13 @@ typedef int (*register_puacb_t)(int types, pua_cb f, void* param ); } ... + The callback function type: + +... +typedef int (pua_cb)(ua_pres_t* hentity, struct sip_msg*); +... + + 6. add_event Field type: diff --git a/modules_k/pua/doc/pua_devel.xml b/modules_k/pua/doc/pua_devel.xml index a5ea3b9..246c17d 100644 --- a/modules_k/pua/doc/pua_devel.xml +++ b/modules_k/pua/doc/pua_devel.xml @@ -88,21 +88,9 @@ typedef struct publ_info should match */ str* extra_headers /* (optional) extra_headers that should be added to Publish msg*/ - publrpl_cb_t* cbrpl;/* callback function to be called when receiving - the reply for the sent request */ - void* cbparam; /* extra parameter for tha callback function */ - }publ_info_t; ... </programlisting> - <para> - The callback function type: - <programlisting format="linespecific"> -... -typedef int (publrpl_cb_t)(struct sip_msg* reply, void* extra_param); -... - </programlisting> - </para> </section> <section> @@ -199,7 +187,7 @@ typedef int (*register_puacb_t)(int types, pua_cb f, void* param ); <para> This function registers a callback to be called on receiving the reply message - for a sent Subscribe request. + for a sent Publish or Subscribe request. The type parameter should be set the same as the source_flag for that request. The function registered as callback for pua should be of type pua_cb , which is: typedef void (pua_cb)(ua_pres_t* hentity, struct msg_start * fl); @@ -217,6 +205,14 @@ typedef int (*register_puacb_t)(int types, pua_cb f, void* param ); } ... </programlisting> + <para> + The callback function type: + <programlisting format="linespecific"> +... +typedef int (pua_cb)(ua_pres_t* hentity, struct sip_msg*); +... + </programlisting> + </para> </example> </section>

14 years, 5 months

git:master: dns cache: fix manually inserted SRV record order

by Miklos Tirpak

Module: sip-router Branch: master Commit: 78beed37b8975e11851553c41c17578481772dad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78beed3… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Aug 18 15:32:36 2010 +0200 dns cache: fix manually inserted SRV record order The manually inserted SRV records thought the RPC interface were not ordered by their priority and weight which resulted in wrong SRV look-ups, i.e. not the highest priority record was chosen first. --- dns_cache.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index 182e61f..ef3a986 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -4221,6 +4221,8 @@ int dns_cache_add_record(unsigned short type, ticks_t expire; int err, h; int size; + struct dns_rr *new_rr, **rr_p, **rr_iter; + struct srv_rdata *srv_rd; /* eliminate gcc warnings */ ip_addr = 0; @@ -4358,6 +4360,7 @@ int dns_cache_add_record(unsigned short type, /* let the rr point to the new structure */ rr = (struct dns_rr*)translate_pointer((char*)new, (char*)old, (char*)rr); + new_rr = rr; if (type == T_SRV) { /* fix the priority, weight, and port */ @@ -4392,6 +4395,7 @@ int dns_cache_add_record(unsigned short type, "DNS cache entry\n"); goto error; } + new_rr = rr; switch(type) { case T_A: @@ -4409,6 +4413,46 @@ int dns_cache_add_record(unsigned short type, /* maximum expire value has been already fixed by * dns_cache_clone_entry() */ } + + if (type == T_SRV) { + /* SRV records must be ordered by their priority and weight. + * With modifying an exising rr, or adding new rr to the DNS entry, + * the ordered list might got broken which needs to be fixed. + */ + rr_p = NULL; + for ( rr_iter = &new->rr_lst; + *rr_iter; + rr_iter = &((*rr_iter)->next) + ) { + if (*rr_iter == new_rr) { + rr_p = rr_iter; + continue; + } + srv_rd = (struct srv_rdata*)(*rr_iter)->rdata; + if ((priority < srv_rd->priority) || + ((priority == srv_rd->priority) && (weight > srv_rd->weight)) + ) + break; /* insert here */ + } + + if (!rr_p) + for ( rr_p = rr_iter; + *rr_p && (*rr_p != new_rr); + rr_p = &((*rr_p)->next) + ); + if (!rr_p) { + LOG(L_ERR, "ERROR: Failed to correct the orderd list of SRV resource records\n"); + goto error; + } + + if (*rr_iter != new_rr->next) { + /* unlink rr from the list */ + *rr_p = (*rr_p)->next; + /* link it before *rr_iter */ + new_rr->next = *rr_iter; + *rr_iter = new_rr; + } + } } }

14 years, 5 months

git:master: pdbt: fix two bugs in debian packaging

by Henning Westerholt

Module: sip-router Branch: master Commit: cd71125fcdb434d50f6e7b5d208d260ebc49fca6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd71125… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Aug 18 13:45:37 2010 +0200 pdbt: fix two bugs in debian packaging --- utils/pdbt/debian/changelog | 2 +- utils/pdbt/debian/rules | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/pdbt/debian/changelog b/utils/pdbt/debian/changelog index a919ba5..353250a 100644 --- a/utils/pdbt/debian/changelog +++ b/utils/pdbt/debian/changelog @@ -2,4 +2,4 @@ pdbt (0.0.1) etch; urgency=low * initial release - -- Henning Westerholt <henning.westerholt(a)1und1.de> Wed, 09 Sep 2009 18:07:30 -- +0200 + -- Henning Westerholt <henning.westerholt(a)1und1.de> Wed, 09 Sep 2009 18:07:30 +0200 diff --git a/utils/pdbt/debian/rules b/utils/pdbt/debian/rules index d902dea..3df7d25 100755 --- a/utils/pdbt/debian/rules +++ b/utils/pdbt/debian/rules @@ -56,7 +56,9 @@ install: build dh_installdirs # Add here commands to install the package into debian/ui-pdbt. - $(MAKE) install DESTDIR=$(CURDIR)/debian/ui-pdbt + mkdir -p $(CURDIR)/debian/pdbt/usr/bin + mkdir -p $(CURDIR)/debian/pdbt/etc + $(MAKE) install DESTDIR=$(CURDIR)/debian/pdbt # Build architecture-independent files here.

14 years, 5 months

git:master: kamailio.cfg: db_url parameters are set via defined DBURL ID

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ecd3a8bab1e402435aea213c2ae7df2f55a59202 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ecd3a8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 18 11:01:46 2010 +0200 kamailio.cfg: db_url parameters are set via defined DBURL ID - one value to be updated in order to change DB connectivity URL, i.e., #!define DBURL "mysql://openser:openserrw@localhost/openser" modparam("xyz", "db_url", DBURL) --- etc/kamailio.cfg | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index e4de392..5bff832 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -64,6 +64,12 @@ ALTER TABLE missed_calls ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; #!endif +# *** Value defines - IDs used later in config +#!ifdef WITH_MYSQL +# - database URL - used to connect to database server by modules such +# as: auth_db, acc, usrloc, a.s.o. +#!define DBURL "mysql://openser:openserrw@localhost/openser" +#!endif ####### Global Parameters ######### @@ -228,8 +234,7 @@ modparam("acc", "log_extra", #!ifdef WITH_ACCDB modparam("acc", "db_flag", 1) modparam("acc", "db_missed_flag", 2) -modparam("acc", "db_url", - "mysql://openser:openserrw@localhost/openser") +modparam("acc", "db_url", DBURL) modparam("acc", "db_extra", "src_user=$fU;src_domain=$fd;dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") #!endif @@ -237,9 +242,8 @@ modparam("acc", "db_extra", # ----- usrloc params ----- /* enable DB persistency for location entries */ #!ifdef WITH_USRLOCDB -modparam("usrloc", "db_mode", 2) -modparam("usrloc", "db_url", - "mysql://openser:openserrw@localhost/openser") +modparam("usrloc", "db_mode", 2) +modparam("usrloc", "db_url", DBURL) #!endif # ----- auth_db params ----- @@ -247,13 +251,11 @@ modparam("usrloc", "db_url", #!ifdef WITH_AUTH modparam("auth_db", "calculate_ha1", yes) modparam("auth_db", "password_column", "password") -modparam("auth_db", "db_url", - "mysql://openser:openserrw@localhost/openser") +modparam("auth_db", "db_url", DBURL) modparam("auth_db", "load_credentials", "") #!ifdef WITH_IPAUTH -modparam("permissions", "db_url", - "mysql://openser:openserrw@localhost/openser") +modparam("permissions", "db_url", DBURL) modparam("permissions", "db_mode", 1) #!endif @@ -262,15 +264,13 @@ modparam("permissions", "db_mode", 1) # ----- alias_db params ----- /* uncomment the following lines if you want to enable the DB based aliases */ -#modparam("alias_db", "db_url", -# "mysql://openser:openserrw@localhost/openser") +#modparam("alias_db", "db_url", DBURL) # ----- domain params ----- /* uncomment the following lines to enable multi-domain detection support */ -#modparam("domain", "db_url", -# "mysql://openser:openserrw@localhost/openser") +#modparam("domain", "db_url", DBURL) #modparam("domain", "db_mode", 1) # Use caching @@ -283,8 +283,7 @@ modparam("permissions", "db_mode", 1) # ----- presence params ----- /* enable presence server support */ #!ifdef WITH_PRESENCE -modparam("presence|presence_xml", "db_url", - "mysql://openser:openserrw@localhost/openser") +modparam("presence|presence_xml", "db_url", DBURL) modparam("presence_xml", "force_active", 1) modparam("presence", "server_address", "sip:10.0.0.10:5060") #!endif

14 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev