Changeset 950:51c15f98a965 in freeDiameter for libfdcore

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).

Location:

libfdcore

Files:

• fdd.l (modified) (2 diffs)
• fdd.y (modified) (7 diffs)
• peers.c (modified) (1 diff)
• peers.c (modified) (1 diff)
• sctp.c (modified) (2 diffs)
• sctp.c (modified) (2 diffs)

libfdcore/fdd.l

@@ -52 +52 @@
         yylloc->first_column = yylloc->last_column + 1;                 \
         yylloc->last_column = yylloc->first_column + yyleng - 1;        \
-        TRACE_DEBUG_ERROR("(%d:%d-%d:%d) matched rule %d, length=%d, txt='%s'\n",       \
+        TRACE_DEBUG_ERROR(                                              \
+                "(%d:%d-%d:%d) matched rule %d, length=%d, txt='%s'\n", \
                 yylloc->first_line, yylloc->first_column,               \
                 yylloc->last_line, yylloc->last_column,                 \
@@ -145 +146 @@
 <*>[[:alnum:]]+         |       /* This rule is only useful to print a complete token in error messages */
         /* Unrecognized character */
-<*>.                    { 
+<*>.                    {
                                 TRACE_DEBUG_ERROR("Unrecognized text on line %d col %d: '%s'.\n", yylloc->first_line, yylloc->first_column, yytext);
                                 return LEX_ERROR; 

libfdcore/fdd.y

@@ -328 +328 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open extension file %s for reading: %s\n", fname, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open extension file %s for reading: %s\n", fname, strerror(ret));
                                         yyerror (&yylloc, conf, "Error adding extension"); 
                                         YYERROR;
@@ -502 +502 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open certificate file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open certificate file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -510 +510 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open private key file %s for reading: %s\n", $5, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open private key file %s for reading: %s\n", $5, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -533 +533 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open CA file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open CA file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -573 +573 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open CRL file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open CRL file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -616 +616 @@
                                                         &err_pos),
                                                 { yyerror (&yylloc, conf, "Error setting Priority parameter.");
-                                                  fprintf(stderr, "Error at position : %s\n", err_pos);
+                                                  TRACE_DEBUG_ERROR("Error at position : %s\n", err_pos);
                                                   YYERROR; } );
                         }
@@ -633 +633 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open DH file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open DH file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;

libfdcore/peers.c

@@ -91 +91 @@
 
 /* Add a new peer entry */
-int fd_peer_add ( struct peer_info * info, char * orig_dbg, void (*cb)(struct peer_info *, void *), void * cb_data )
+int fd_peer_add ( struct peer_info * info, const char * orig_dbg, void (*cb)(struct peer_info *, void *), void * cb_data )
 {
         struct fd_peer *p = NULL;

libfdcore/peers.c

@@ -549 +549 @@
         ev_data->validate = !found;
         
-        CHECK_FCT_DO( ret = fd_event_send(peer->p_events, FDEVP_CNX_INCOMING, sizeof(ev_data), ev_data), goto out );
+        CHECK_FCT_DO( ret = fd_event_send(peer->p_events, FDEVP_CNX_INCOMING, sizeof(*ev_data), ev_data), goto out );
         
 out:    

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;