Changeset 950:51c15f98a965 in freeDiameter for libfdcore/sctp.c

Timestamp:

Feb 21, 2013, 7:57:32 PM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Parents:

949:ad5c976e0dc7 (diff), 924:877592751fee (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

merge current version from 1.1 branch (927:877592751fee).

Files:

• libfdcore/sctp.c (modified) (2 diffs)
• libfdcore/sctp.c (modified) (2 diffs)

libfdcore/sctp.c

@@ -909 +909 @@
         }
         if (TRACE_BOOL(SCTP_LEVEL)) {
+                char buf[1024];
+                sSA_DUMP_NODE_SERV(buf, sizeof(buf), &status.sstat_primary.spinfo_address, NI_NUMERICHOST | NI_NUMERICSERV );
                 fd_log_debug( "SCTP_STATUS : sstat_state                  : %i\n" , status.sstat_state);
                 fd_log_debug( "              sstat_rwnd                   : %u\n" , status.sstat_rwnd);
@@ -916 +918 @@
                 fd_log_debug( "              sstat_outstrms               : %hu\n", status.sstat_outstrms);
                 fd_log_debug( "              sstat_fragmentation_point    : %u\n" , status.sstat_fragmentation_point);
-                fd_log_debug( "              sstat_primary.spinfo_address : ");
-                sSA_DUMP_NODE_SERV(&status.sstat_primary.spinfo_address, NI_NUMERICHOST | NI_NUMERICSERV );
-                fd_log_debug( "\n" );
+                fd_log_debug( "              sstat_primary.spinfo_address : %s\n" , buf);
                 fd_log_debug( "              sstat_primary.spinfo_state   : %d\n" , status.sstat_primary.spinfo_state);
                 fd_log_debug( "              sstat_primary.spinfo_cwnd    : %u\n" , status.sstat_primary.spinfo_cwnd);

libfdcore/sctp.c

@@ -654 +654 @@
                 if (ep->sa.sa_family == AF_INET6)
                 #else /* SCTP_USE_MAPPED_ADDRESSES */
-                if (target_family == AF_INET6) {
+                if (target_family == AF_INET6)
                 #endif /* SCTP_USE_MAPPED_ADDRESSES */
                         sz = sizeof(sSA6);
@@ -1087 +1087 @@
         /* We will loop while all data is not received. */
 incomplete:
-        if (datasize == bufsz - sizeof(struct timespec)) {
+        while (datasize + sizeof(struct timespec) >= bufsz ) {
                 /* The buffer is full, enlarge it */
                 bufsz += mempagesz;