Changeset 74:9dcb1bd11a07 in freeDiameter

Timestamp:

Dec 1, 2009, 2:14:34 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Some cleanups

Files:

• README (modified) (1 diff)
• freeDiameter/cnxctx.c (modified) (1 diff)
• freeDiameter/p_dw.c (modified) (3 diffs)
• freeDiameter/p_psm.c (modified) (4 diffs)
• freeDiameter/p_sr.c (modified) (3 diffs)
• freeDiameter/server.c (modified) (1 diff)

README

@@ -11 +11 @@
 
 See INSTALL for information on building and using this software.
+
+--------------
+Known possible bugs:
+ - management of the Host-IP-Address values in CER/CEA may be strange (for TCP and SCTP)
+ 

freeDiameter/cnxctx.c

@@ -704 +704 @@
         {
                 char buf[48];
-                snprintf(buf, sizeof(buf), "Receiver (%d) TLS/ single stream)", conn->cc_socket);
+                snprintf(buf, sizeof(buf), "Receiver (%d) TLS/single stream", conn->cc_socket);
                 fd_log_threadname ( buf );
         }

freeDiameter/p_dw.c

@@ -141 +141 @@
 int fd_p_dw_timeout(struct fd_peer * peer)
 {
+        TRACE_ENTRY("%p", peer);
+
         if (peer->p_flags.pf_dw_pending) {
                 /* We have sent a DWR and received no answer during TwTimer */
@@ -151 +153 @@
         }
         
-        
         return 0;
 }
@@ -158 +159 @@
 int fd_p_dw_reopen(struct fd_peer * peer)
 {
+        TRACE_ENTRY("%p", peer);
+
         peer->p_flags.pf_reopen_cnt = 1;
+        peer->p_flags.pf_cnx_pb = 0;
         CHECK_FCT( send_DWR(peer) );
         

freeDiameter/p_psm.c

@@ -236 +236 @@
         peer->p_psm_timer.tv_sec += delay;
         
+        TRACE_DEBUG(FULL, "Peer timeout reset to %d seconds%s", delay, add_random ? " (+/- 2)", "" );
+        
 #ifdef SLOW_PSM
         /* temporary for debug */
@@ -246 +248 @@
 {
         /* Move to CLOSED state: failover messages, stop OUT thread, unlink peer from active list */
-        CHECK_FCT_DO( fd_psm_change_state(peer, STATE_CLOSED), /* continue */ );
+        if (peer->p_hdr.info.runtime.pir_state != STATE_ZOMBIE) {
+                CHECK_FCT_DO( fd_psm_change_state(peer, STATE_CLOSED), /* continue */ );
+        }
         
         fd_p_cnx_abort(peer, terminate);
@@ -514 +518 @@
                 switch (peer->p_hdr.info.runtime.pir_state) {
                         case STATE_WAITCNXACK_ELEC:
-                                TODO("Reply CEA on the receiver side and go to OPEN state");
-                                goto psm_loop;
+                                /* Abort the initiating side */
+                                fd_p_cnx_abort(peer, 0);
+                                /* Process the receiver side */
+                                CHECK_FCT_DO( fd_p_ce_process_receiver(peer), goto psm_end );
+                                break;
                         
                         case STATE_OPEN:
@@ -534 +541 @@
                                 
                         case STATE_CLOSED:
-                                /* Go to the next event */
-                                goto psm_loop;
-                }
+                                /* Just ignore */
+                                ;
+                }
+                goto psm_loop;
         }
         

freeDiameter/p_sr.c

@@ -36 +36 @@
 #include "fD.h"
 
+#ifndef SR_DEBUG_LVL
+#define SR_DEBUG_LVL ANNOYING
+#endif /* SR_DEBUG_LVL */
+
 /* Structure to store a sent request */
 struct sentreq {
@@ -61 +65 @@
 {
         struct fd_list * li;
-        if (!TRACE_BOOL(FULL))
+        if (!TRACE_BOOL(SR_DEBUG_LVL))
                 return;
         fd_log_debug("%sSentReq list @%p:\n", text, srlist);
@@ -68 +72 @@
                 uint32_t * nexthbh = li->o;
                 fd_log_debug(" - Next req (%x):\n", *nexthbh);
-                fd_msg_dump_one(FULL + 1, sr->req);
+                fd_msg_dump_one(SR_DEBUG_LVL + 1, sr->req);
         }
 }

freeDiameter/server.c

@@ -142 +142 @@
         CHECK_FCT_DO( fd_msg_parse_rules( msg, fd_g_config->cnf_dict, NULL ), /* Parsing failed -- trace details ? */ goto cleanup );
         
-        if (TRACE_BOOL(FULL)) {
-                fd_log_debug("Received Diameter message from new client '%s':\n", fd_cnx_getid(c->conn));
-                fd_msg_dump_walk(FULL, msg);
-        }
+        fd_msg_dump_walk(FULL, msg);
         
         /* Now check we received a CER */