sr-dev May 2014

sr-dev@lists.kamailio.org

34 participants
238 discussions

[tracker] Comment added: crash in parser/sdp/sdp_helpr_funcs.c (Attachment added)
by sip-router 29 May '14

29 May '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#435 - crash in parser/sdp/sdp_helpr_funcs.c User who did this - Michael Ricordeau (mricordeau) ---------- Hi Daniel, I have attached the output gdb trace (trace1.txt) . Thanks ! ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=435#comment1481 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: crash in parser/sdp/sdp_helpr_funcs.c
by sip-router 29 May '14

29 May '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#435 - crash in parser/sdp/sdp_helpr_funcs.c User who did this - Daniel-Constantin Mierla (miconda) ---------- Can you attach the output from gdb for: set print elements 3000 frame 26 p *buf ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=435#comment1480 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:4.1: parser/sdp: assign stream var only if session is not null
by Daniel-Constantin Mierla 29 May '14

29 May '14

Module: sip-router Branch: 4.1 Commit: ad5235229f59ba5d1f4216e144291e110fee0211 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad52352… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 14 23:28:24 2014 +0200 parser/sdp: assign stream var only if session is not null (cherry picked from commit 1cefc0c5f83eb4b7b6ffefc6ab383d7aae6de07f) --- parser/sdp/sdp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index fde60d3..1e53940 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -871,12 +871,13 @@ void print_sdp_stream(sdp_stream_cell_t *stream, int log_level) void print_sdp_session(sdp_session_cell_t *session, int log_level) { - sdp_stream_cell_t *stream = session->streams; + sdp_stream_cell_t *stream; if (session==NULL) { LM_ERR("NULL session\n"); return; } + stream = session->streams; LOG(log_level, "..session[%d]:%p=>%p '%.*s' '%.*s' '%.*s' '%.*s:%.*s' (%d)=>%p\n", session->session_num, session, session->next,

1 0

[tracker] Task opened: crash in parser/sdp/sdp_helpr_funcs.c (Attachment added)
by sip-router 28 May '14

28 May '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Michael Ricordeau (mricordeau) Attached to Project - sip-router Summary - crash in parser/sdp/sdp_helpr_funcs.c Task Type - Bug Report Category - Core Status - Unconfirmed Assigned To - Operating System - Linux Severity - High Priority - Normal Reported Version - 4.1 Due in Version - Undecided Due Date - Undecided Details - Hi, Kamailio 4.1.2 is crashing sometimes while parsing sdp. I can't reproduce it directly but it happened a few times . Kamailio version : version: kamailio 4.1.2 (x86_64/linux) 6fa599 flags: STATS: Off, USE_TCP, USE_TLS, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, DBG_QM_MALLOC, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 4MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 6fa599 compiled on 10:30:24 Mar 18 2014 with gcc 4.4.5 I have also attached the gdb bt full (gdb.txt) Mike One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=435 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: pkg/rpm: use pkg memory size when checking config in init script
by Daniel-Constantin Mierla 28 May '14

28 May '14

Module: sip-router Branch: master Commit: 91a362e2f1bae90e2564491560aff8bad5b04564 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=91a362e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 28 15:47:10 2014 +0200 pkg/rpm: use pkg memory size when checking config in init script - for large configs, check can fail due to low memory --- pkg/kamailio/rpm/kamailio.init | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/rpm/kamailio.init b/pkg/kamailio/rpm/kamailio.init index 585ad77..cf76929 100644 --- a/pkg/kamailio/rpm/kamailio.init +++ b/pkg/kamailio/rpm/kamailio.init @@ -35,7 +35,7 @@ check_fork () check_kamailio_config () { # Check if kamailio configuration is valid before starting the server - out=$($KAM -c 2>&1 > /dev/null) + out=$($KAM -M $PKG_MEMORY -c 2>&1 > /dev/null) retcode=$? if [ "$retcode" != '0' ]; then echo "Not starting $DESC: invalid configuration file!"

1 0

git:master: modules/cdp: added RPC cmd to list diameter information, including peers and their detail
by Jason Penton 28 May '14

28 May '14

Module: sip-router Branch: master Commit: 93ae7f441c6e7760d026e5b8e01a86f05ce59b97 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=93ae7f4… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed May 28 12:12:35 2014 +0200 modules/cdp: added RPC cmd to list diameter information, including peers and their detail --- modules/cdp/cdp_rpc.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/modules/cdp/cdp_rpc.c b/modules/cdp/cdp_rpc.c index 53aabe5..0db5b26 100644 --- a/modules/cdp/cdp_rpc.c +++ b/modules/cdp/cdp_rpc.c @@ -12,10 +12,13 @@ #include "../../dprint.h" extern dp_config *config; +extern peer_list_t *peer_list; +extern gen_lock_t *peer_list_lock; +extern char *dp_states[]; static const char* cdp_rpc_disable_peer_doc[2] = {"disable diameter peer", 0 }; static const char* cdp_rpc_enable_peer_doc[2] = {"enable diameter peer", 0 }; - +static const char* cdp_rpc_list_peers_doc[2] = {"list diameter peers and their state", 0 }; static void cdp_rpc_enable_peer(rpc_t* rpc, void* ctx) { @@ -58,9 +61,57 @@ static void cdp_rpc_disable_peer(rpc_t* rpc, void* ctx) } +static void cdp_rpc_list_peers(rpc_t* rpc, void* ctx) +{ + void *peers_header; + void *peers_container; + void *peerdetail_container; + peer *i; + + if (rpc->add(ctx, "{", &peers_header) < 0) { + rpc->fault(ctx, 500, "Internal error creating top rpc"); + return; + } + + if (rpc->struct_add(peers_header, "SSddddddd{", + "Realm", &config->realm, + "Identity", &config->identity, + "Accept unknown peers", config->accept_unknown_peers, + "Connect timeout", config->connect_timeout, + "Transaction timeout", config->transaction_timeout, + "Default auth session timeout", config->default_auth_session_timeout, + "Queue length", config->queue_length, + "Workers", config->workers, + "Peer count", config->peers_cnt, + "Peers", &peers_container) < 0) { + rpc->fault(ctx, 500, "Internal error creating peers header struct"); + return; + } + + lock_get(peer_list_lock); + i = peer_list->head; + while (i) { + if (rpc->struct_add(peers_container, "S{", + "FQDN", &i->fqdn, + "Details", &peerdetail_container) < 0) { + rpc->fault(ctx, 500, "Internal error creating peers container struct"); + return; + } + if (rpc->struct_add(peerdetail_container, "ss", + "State", dp_states[(int)i->state], + "Disabled", i->disabled?"True":"False") < 0) { + rpc->fault(ctx, 500, "Internal error creating peer detail container struct"); + return; + } + i = i->next; + } + lock_release(peer_list_lock); +} + rpc_export_t cdp_rpc[] = { {"cdp.disable_peer", cdp_rpc_disable_peer, cdp_rpc_disable_peer_doc, 0}, {"cdp.enable_peer", cdp_rpc_enable_peer, cdp_rpc_enable_peer_doc, 0}, + {"cdp.list_peers", cdp_rpc_list_peers, cdp_rpc_list_peers_doc, 0}, {0, 0, 0, 0} };

1 0

git:4.1: rls: Fix memory leak with duplicate entries in lists
by Hugh Waite 28 May '14

28 May '14

Module: sip-router Branch: 4.1 Commit: 5cd3bd3a1bbcc9edffe31c0b1fdf11da43023b2c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5cd3bd3… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Tue May 27 15:42:08 2014 +0100 rls: Fix memory leak with duplicate entries in lists - When duplicate detection is requested, free the string and container - When duplicate detection is not requested, insert the duplicate anyway --- modules/rls/list.h | 10 ++++++++-- modules/rls/subscribe.c | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/rls/list.h b/modules/rls/list.h index c9904aa..8c13b4d 100644 --- a/modules/rls/list.h +++ b/modules/rls/list.h @@ -41,8 +41,11 @@ static inline list_entry_t *list_insert(str *strng, list_entry_t *list, int *dup if (cmp == 0) { if (duplicate != NULL) + { *duplicate = 1; - return list; + pkg_free(p); + return list; + } } if (cmp > 0) { @@ -58,8 +61,11 @@ static inline list_entry_t *list_insert(str *strng, list_entry_t *list, int *dup if (cmp == 0) { if (duplicate != NULL) + { *duplicate = 1; - return list; + pkg_free(p); + return list; + } } p->next = q->next; diff --git a/modules/rls/subscribe.c b/modules/rls/subscribe.c index d15a601..7c45908 100644 --- a/modules/rls/subscribe.c +++ b/modules/rls/subscribe.c @@ -1037,6 +1037,8 @@ int send_resource_subs(char* uri, void* param) LM_WARN("%.*s has %.*s multiple times in the same resource list\n", s->watcher_uri->len, s->watcher_uri->s, s->pres_uri->len, s->pres_uri->s); + pkg_free(tmp_str->s); + pkg_free(tmp_str); return 1; }

1 0

git:master: rls: Fix memory leak with duplicate entries in lists
by Hugh Waite 28 May '14

28 May '14

Module: sip-router Branch: master Commit: a0c35bbfa84fd2212c05e5af1d2423a4a2e5e547 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0c35bb… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Tue May 27 15:42:08 2014 +0100 rls: Fix memory leak with duplicate entries in lists - When duplicate detection is requested, free the string and container - When duplicate detection is not requested, insert the duplicate anyway --- modules/rls/list.h | 12 ++++++++---- modules/rls/subscribe.c | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/rls/list.h b/modules/rls/list.h index f65c408..8c13b4d 100644 --- a/modules/rls/list.h +++ b/modules/rls/list.h @@ -41,9 +41,11 @@ static inline list_entry_t *list_insert(str *strng, list_entry_t *list, int *dup if (cmp == 0) { if (duplicate != NULL) + { *duplicate = 1; - pkg_free(p); - return list; + pkg_free(p); + return list; + } } if (cmp > 0) { @@ -59,9 +61,11 @@ static inline list_entry_t *list_insert(str *strng, list_entry_t *list, int *dup if (cmp == 0) { if (duplicate != NULL) + { *duplicate = 1; - pkg_free(p); - return list; + pkg_free(p); + return list; + } } p->next = q->next; diff --git a/modules/rls/subscribe.c b/modules/rls/subscribe.c index d15a601..7c45908 100644 --- a/modules/rls/subscribe.c +++ b/modules/rls/subscribe.c @@ -1037,6 +1037,8 @@ int send_resource_subs(char* uri, void* param) LM_WARN("%.*s has %.*s multiple times in the same resource list\n", s->watcher_uri->len, s->watcher_uri->s, s->pres_uri->len, s->pres_uri->s); + pkg_free(tmp_str->s); + pkg_free(tmp_str); return 1; }

1 0

Acc patch to log CDRs for expired dialogs
by Lucian Balaceanu 27 May '14

27 May '14

Hi all, At 1&1 we have a patch for the Acc module that allows us to log CDRs from expired dialogs (for example when a UA would fail and would not transmit a final message). Would you see a benefit from pushing this code upstream? If so, would you like to see this implemented as a switchable feature (through the use of a config parameter) or as something enabled all the time? I know that the current view on things, stated in the Acc module documentation is: "If a UA fails in middle of conversation, a proxy will never find out about it. In general, a better practice is to account from an end-device (such as PSTN gateway), which best knows about call status (including media status and PSTN status in case of the gateway). " What do you think? Thank you!

2 1

git:master: modules/cdp: new RPC commands to disable/ enable a peer dynamically
by Jason Penton 27 May '14

27 May '14

Module: sip-router Branch: master Commit: 81287cb27c87c641f3d314fbabc921345323b864 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81287cb… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Tue May 27 20:55:11 2014 +0200 modules/cdp: new RPC commands to disable/enable a peer dynamically - this is useful to disable a particular diameter peer in a cluster --- modules/cdp/cdp_rpc.c | 66 +++++++++++++++++++++++++++++++++++++++++ modules/cdp/cdp_rpc.h | 16 ++++++++++ modules/cdp/config.h | 2 +- modules/cdp/diameter_comm.c | 1 + modules/cdp/doc/cdp_admin.xml | 24 +++++++++++++-- modules/cdp/mod.c | 8 ++++- modules/cdp/peer.h | 1 + modules/cdp/peermanager.c | 18 ++++++++++- modules/cdp/routing.c | 5 ++- 9 files changed, 133 insertions(+), 8 deletions(-) diff --git a/modules/cdp/cdp_rpc.c b/modules/cdp/cdp_rpc.c new file mode 100644 index 0000000..53aabe5 --- /dev/null +++ b/modules/cdp/cdp_rpc.c @@ -0,0 +1,66 @@ +/* + * rpc.c + * + * Created on: 27 May 2014 + * Author: jaybeepee + */ +#include "cdp_rpc.h" +#include "peermanager.h" +#include "peerstatemachine.h" +#include "receiver.h" +#include "../../str.h" +#include "../../dprint.h" + +extern dp_config *config; + +static const char* cdp_rpc_disable_peer_doc[2] = {"disable diameter peer", 0 }; +static const char* cdp_rpc_enable_peer_doc[2] = {"enable diameter peer", 0 }; + + +static void cdp_rpc_enable_peer(rpc_t* rpc, void* ctx) +{ + peer *cdp_peer; + str peer_fqdn; + + if (rpc->scan(ctx, "S", &peer_fqdn) < 1) { + rpc->fault(ctx, 400, "required peer fqdn argument"); + return; + } + + cdp_peer = get_peer_by_fqdn(&peer_fqdn); + if (cdp_peer != NULL) { + LM_DBG("Enabling CDP Peer: [%.*s]\n", peer_fqdn.len, peer_fqdn.s); + cdp_peer->disabled = 0; + return; + } + rpc->fault(ctx, 400, "peer not found"); + return; +} + +static void cdp_rpc_disable_peer(rpc_t* rpc, void* ctx) +{ + peer *cdp_peer; + str peer_fqdn; + + if (rpc->scan(ctx, "S", &peer_fqdn) < 1) { + rpc->fault(ctx, 400, "required peer fqdn argument"); + return; + } + cdp_peer = get_peer_by_fqdn(&peer_fqdn); + if (cdp_peer != NULL) { + LM_DBG("Disabling CDP peer: [%.*s]\n", peer_fqdn.len, peer_fqdn.s); + cdp_peer->disabled = 1; + return; + } + + rpc->fault(ctx, 400, "peer not found"); + return; + +} + +rpc_export_t cdp_rpc[] = { + {"cdp.disable_peer", cdp_rpc_disable_peer, cdp_rpc_disable_peer_doc, 0}, + {"cdp.enable_peer", cdp_rpc_enable_peer, cdp_rpc_enable_peer_doc, 0}, + {0, 0, 0, 0} +}; + diff --git a/modules/cdp/cdp_rpc.h b/modules/cdp/cdp_rpc.h new file mode 100644 index 0000000..ea7524a --- /dev/null +++ b/modules/cdp/cdp_rpc.h @@ -0,0 +1,16 @@ +/* + * rpc.h + * + * Created on: 27 May 2014 + * Author: jaybeepee + */ + +#ifndef RPC_H_ +#define RPC_H_ + +#include "../../rpc.h" +#include "config.h" + +extern rpc_export_t cdp_rpc[]; + +#endif /* RPC_H_ */ diff --git a/modules/cdp/config.h b/modules/cdp/config.h index 2cda05f..c011893 100644 --- a/modules/cdp/config.h +++ b/modules/cdp/config.h @@ -124,7 +124,7 @@ typedef struct { acceptor_config *acceptors; /**< list of acceptors */ int acceptors_cnt; /**< size of the list of acceptors */ - app_config *applications; /**< list of supporter applications */ + app_config *applications; /**< list of supported applications */ int applications_cnt; /**< size of list of supported applications*/ int *supported_vendors; /**< list of supported vendor ids */ diff --git a/modules/cdp/diameter_comm.c b/modules/cdp/diameter_comm.c index 82d05c4..5e28e91 100644 --- a/modules/cdp/diameter_comm.c +++ b/modules/cdp/diameter_comm.c @@ -138,6 +138,7 @@ AAAReturnCode AAASendMessage( LM_ERR("AAASendMessage(): Can't find a suitable connected peer in the routing table.\n"); goto error; } + LM_DBG("Found diameter peer [%.*s] from routing table\n", p->fqdn.len, p->fqdn.s); if (p->state!=I_Open && p->state!=R_Open){ LM_ERR("AAASendMessage(): Peer not connected to %.*s\n",p->fqdn.len,p->fqdn.s); goto error; diff --git a/modules/cdp/doc/cdp_admin.xml b/modules/cdp/doc/cdp_admin.xml index 52d7907..904b193 100644 --- a/modules/cdp/doc/cdp_admin.xml +++ b/modules/cdp/doc/cdp_admin.xml @@ -15,9 +15,9 @@ <para>CDP (C Diameter Peer) allows Diameter communication to and from Kamailio. Most of the code is inherited from DISC http://developer.berlios.de/projects/disc/ and OpenIMS and modified for - use within Kamailio. A few improvements and new functionality has been added - along the way, for example, threshold reporting on Diameter calls that are - serviced above a certain threshold.</para> + use within Kamailio. A few improvements and new functionality has been + added along the way, for example, threshold reporting on Diameter calls + that are serviced above a certain threshold.</para> </section> <section> @@ -138,6 +138,24 @@ modparam("cdp", "latency_threshold", 1000) </section> <section> + <title>RPC Commands</title> + + <para>exported RPC commands.</para> + + <section> + <title>cdp.disable_peer</title> + + <para>instantly disable a particular diameter peer.</para> + </section> + + <section> + <title>cdp.enable_peer</title> + + <para>enabe/re-enable a diameter peer</para> + </section> + </section> + + <section> <title>Configuration Examples</title> <section> diff --git a/modules/cdp/mod.c b/modules/cdp/mod.c index 0f12b4c..655ae86 100644 --- a/modules/cdp/mod.c +++ b/modules/cdp/mod.c @@ -51,7 +51,9 @@ #include "diameter_peer.h" #include "config.h" #include "cdp_load.h" - +#include "cdp_rpc.h" +#include "../../rpc.h" +#include "../../rpc_lookup.h" #include "../../cfg/cfg_struct.h" MODULE_VERSION @@ -198,6 +200,10 @@ struct module_exports exports = { */ static int cdp_init( void ) { + if (rpc_register_array(cdp_rpc) != 0) { + LM_ERR("failed to register RPC commands for CDP module\n"); + return -1; + } #ifdef STATISTICS /* register statistics */ if ( register_stat("cdp", "replies_response_time", &replies_response_time,0 )!=0 ) { diff --git a/modules/cdp/peer.h b/modules/cdp/peer.h index 112e7f8..cf0451a 100644 --- a/modules/cdp/peer.h +++ b/modules/cdp/peer.h @@ -112,6 +112,7 @@ typedef struct _peer_t{ time_t activity; /**< timestamp of last activity */ int is_dynamic; /**< whether this peer was accepted although it was not initially configured */ + int disabled; /**< administratively enable/disable a peer - ie remove/re-add from service dynamically */ int waitingDWA; /**< if a Diameter Watch-dog Request was sent out and waiting for an answer */ str send_pipe_name; /**< pipe to signal messages to be sent out*/ diff --git a/modules/cdp/peermanager.c b/modules/cdp/peermanager.c index e2cb4d4..9a0729f 100644 --- a/modules/cdp/peermanager.c +++ b/modules/cdp/peermanager.c @@ -264,6 +264,16 @@ int peer_timer(time_t now,void *ptr) while(p){ lock_get(p->lock); n = p->next; + + if (p->disabled && (p->state != Closed || p->state != Closing)) { + LM_DBG("Peer [%.*s] has been disabled - shutting down\n", p->fqdn.len, p->fqdn.s); + if (p->state == I_Open) sm_process(p, Stop, 0, 1, p->I_sock); + if (p->state == R_Open) sm_process(p, Stop, 0, 1, p->R_sock); + lock_release(p->lock); + p = n; + continue; + } + if (p->activity+config->tc<=now){ LM_INFO("peer_timer(): Peer %.*s \tState %d \n",p->fqdn.len,p->fqdn.s,p->state); switch (p->state){ @@ -274,8 +284,10 @@ int peer_timer(time_t now,void *ptr) free_peer(p,1); break; } - touch_peer(p); - sm_process(p,Start,0,1,0); + if (!p->disabled) { + touch_peer(p); + sm_process(p,Start,0,1,0); + } break; /* timeouts */ case Wait_Conn_Ack: @@ -293,10 +305,12 @@ int peer_timer(time_t now,void *ptr) p->waitingDWA = 0; if (p->state==I_Open) sm_process(p,I_Peer_Disc,0,1,p->I_sock); if (p->state==R_Open) sm_process(p,R_Peer_Disc,0,1,p->R_sock); + LM_WARN("Inactivity on peer [%.*s] and no DWA, Closing peer...\n", p->fqdn.len, p->fqdn.s); } else { p->waitingDWA = 1; Snd_DWR(p); touch_peer(p); + LM_WARN("Inactivity on peer [%.*s], sending DWR... - if we don't get a reply, the peer will be closed\n", p->fqdn.len, p->fqdn.s); } break; /* ignored states */ diff --git a/modules/cdp/routing.c b/modules/cdp/routing.c index f468e11..4e84be2 100644 --- a/modules/cdp/routing.c +++ b/modules/cdp/routing.c @@ -86,7 +86,7 @@ peer* get_first_connected_route(routing_entry *r,int app_id,int vendor_id) else LM_DBG("The peer %.*s state is %s\n",i->fqdn.len,i->fqdn.s, (p->state==I_Open||p->state==R_Open)?"opened":"closed"); - if (p && (p->state==I_Open || p->state==R_Open) && peer_handles_application(p,app_id,vendor_id)) { + if (p && !p->disabled && (p->state==I_Open || p->state==R_Open) && peer_handles_application(p,app_id,vendor_id)) { LM_DBG("The peer %.*s matches - will forward there\n",i->fqdn.len,i->fqdn.s); return p; } @@ -112,6 +112,8 @@ peer* get_routing_peer(AAAMessage *m) routing_realm *rr; int app_id=0,vendor_id=0; + LM_DBG("getting diameter routing peer for realm: [%.*s]\n", m->dest_realm->data.len, m->dest_realm->data.s); + app_id = m->applicationId; avp = AAAFindMatchingAVP(m,0,AVP_Vendor_Specific_Application_Id,0,AAA_FORWARD_SEARCH); if (avp){ @@ -178,6 +180,7 @@ peer* get_routing_peer(AAAMessage *m) } /* if not found in the realms or no destination_realm, * get the first connected host in default routes */ + LM_DBG("no routing peer found, trying default route\n"); p = get_first_connected_route(config->r_table->routes,app_id,vendor_id); if (!p){ LM_ERR("get_routing_peer(): No connected DefaultRoute peer found for app_id %d and vendor id %d.\n",

2 1

← Newer
1
2
3
4
5
6
7
8
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2014