Changeset 26:b4684b76c6ab in freeDiameter

Timestamp:

Oct 26, 2009, 4:44:16 PM (15 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Fix erroneous %g specifiers for size_t (correct is %z)

Location:

freeDiameter

Files:

• cnxctx.c (modified) (4 diffs)
• p_psm.c (modified) (1 diff)
• sctp.c (modified) (2 diffs)
• sctps.c (modified) (2 diffs)
• server.c (modified) (3 diffs)

freeDiameter/cnxctx.c

@@ -504 +504 @@
                    || (length > DIAMETER_MSG_SIZE_MAX)) { /* to avoid too big mallocs */
                         /* The message is suspect */
-                        TRACE_DEBUG(INFO, "Received suspect header [ver: %d, size: %g], assume disconnection", (int)header[0], length);
+                        TRACE_DEBUG(INFO, "Received suspect header [ver: %d, size: %z], assume disconnection", (int)header[0], length);
                         goto error; /* Stop the thread, the recipient of the event will cleanup */
                 }
@@ -630 +630 @@
                    || (length > DIAMETER_MSG_SIZE_MAX)) { /* to avoid too big mallocs */
                         /* The message is suspect */
-                        TRACE_DEBUG(INFO, "Received suspect header [ver: %d, size: %g], assume disconnection", (int)header[0], length);
+                        TRACE_DEBUG(INFO, "Received suspect header [ver: %d, size: %z], assume disconnection", (int)header[0], length);
                         goto out;
                 }
@@ -895 +895 @@
         ssize_t ret;
         size_t sent = 0;
-        TRACE_ENTRY("%p %p %g", conn, buf, len);
+        TRACE_ENTRY("%p %p %z", conn, buf, len);
         do {
                 if (conn->cc_tls) {
@@ -910 +910 @@
 int fd_cnx_send(struct cnxctx * conn, unsigned char * buf, size_t len)
 {
-        TRACE_ENTRY("%p %p %g", conn, buf, len);
+        TRACE_ENTRY("%p %p %z", conn, buf, len);
         
         CHECK_PARAMS(conn && (conn->cc_socket > 0) && buf && len);
 
-        TRACE_DEBUG(FULL, "Sending %gb %sdata on connection %s", len, conn->cc_tls ? "TLS-protected ":"", conn->cc_id);
+        TRACE_DEBUG(FULL, "Sending %zb %sdata on connection %s", len, conn->cc_tls ? "TLS-protected ":"", conn->cc_id);
         
         switch (conn->cc_proto) {

freeDiameter/p_psm.c

@@ -164 +164 @@
         /* Get next event */
         CHECK_FCT_DO( fd_event_timedget(peer->p_events, &peer->p_psm_timer, FDEVP_PSM_TIMEOUT, &event, &ev_sz, &ev_data), goto psm_end );
-        TRACE_DEBUG(FULL, "'%s'\t<-- '%s'\t(%p,%g)\t'%s'",
+        TRACE_DEBUG(FULL, "'%s'\t<-- '%s'\t(%p,%z)\t'%s'",
                         STATE_STR(peer->p_hdr.info.pi_state),
                         fd_pev_str(event), ev_data, ev_sz,

freeDiameter/sctp.c

@@ -764 +764 @@
         if (sz != sizeof(status))
         {
-                TRACE_DEBUG(INFO, "Invalid size of socket option: %d / %g", sz, sizeof(status));
+                TRACE_DEBUG(INFO, "Invalid size of socket option: %d / %z", sz, sizeof(status));
                 return ENOTSUP;
         }
@@ -911 +911 @@
         ssize_t ret;
         
-        TRACE_ENTRY("%d %hu %p %g", sock, strid, buf, len);
+        TRACE_ENTRY("%d %hu %p %z", sock, strid, buf, len);
         
         memset(&mhdr, 0, sizeof(mhdr));

freeDiameter/sctps.c

@@ -136 +136 @@
         struct sctps_ctx * ctx = (struct sctps_ctx *) tr;
         
-        TRACE_ENTRY("%p %p %g", tr, data, len);
+        TRACE_ENTRY("%p %p %z", tr, data, len);
         CHECK_PARAMS_DO( tr && data, { errno = EINVAL; return -1; } );
         
@@ -151 +151 @@
         int emptied;
         
-        TRACE_ENTRY("%p %p %g", tr, buf, len);
+        TRACE_ENTRY("%p %p %z", tr, buf, len);
         CHECK_PARAMS_DO( tr && buf, { errno = EINVAL; return -1; } );
         

freeDiameter/server.c

@@ -100 +100 @@
         struct client * c = arg;
         struct server * s = NULL;
+        uint8_t       * buf = NULL;
+        size_t          bufsz;
+        struct msg    * msg = NULL;
+        struct msg_hdr *hdr = NULL;
         
         TRACE_ENTRY("%p", c);
@@ -127 +131 @@
         c->ts.tv_sec += INCNX_TIMEOUT;
         
-        TODO("receive message until c->ts");
-        
-        TODO("Timeout => close");
-        TODO("Message != CER => close");
-        TODO("Message == CER : ");
+        /* Receive the first Diameter message on the connection -- cleanup in case of timeout */
+        CHECK_FCT_DO( fd_cnx_receive(c->conn, &c->ts, &buf, &bufsz), goto cleanup );
+        
+        TRACE_DEBUG(FULL, "Received %zb from new client '%s'", bufsz, fd_cnx_getid(c->conn));
+        
+        /* Try parsing this message */
+        CHECK_FCT_DO( fd_msg_parse_buffer( &buf, bufsz, &msg ), /* Parsing failed */ goto cleanup );
+        
+        /* We expect a CER, it must parse with our dictionary */
+        CHECK_FCT_DO( fd_msg_parse_dict( msg, fd_g_config->cnf_dict ), /* Parsing failed */ 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);
+        }
+        
+        /* Now check we received a CER */
+        CHECK_FCT_DO( fd_msg_hdr ( msg, &hdr ), goto fatal_error );
+        
+        CHECK_PARAMS_DO( (hdr->msg_appl == 0) && (hdr->msg_flags & CMD_FLAG_REQUEST) && (hdr->msg_code == CC_CAPABILITIES_EXCHANGE),
+                { fd_log_debug("Connection '%s', expecting CER, received something else, closing...\n", fd_cnx_getid(c->conn)); goto cleanup; } );
+        
+        
         TODO("Search matching peer");
         TODO("Send event to the peer");
@@ -146 +168 @@
         if (c->conn)
                 fd_cnx_destroy(c->conn);
+        
+        /* Cleanup the received buffer if any */
+        free(buf);
+        
+        /* Cleanup the parsed message if any */
+        if (msg) {
+                CHECK_FCT_DO( fd_msg_free(msg), /* continue */);
+        }
         
         /* Detach the thread, cleanup the client structure */