Changeset 1027:0117a7746b21 in freeDiameter for extensions/rt_redirect

Timestamp:

Apr 15, 2013, 4:17:07 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix a number of errors and warnings introduced/highlighted by recent commits

Location:

extensions/rt_redirect

Files:

• redir_fwd.c (modified) (2 diffs)
• redir_out.c (modified) (3 diffs)

extensions/rt_redirect/redir_fwd.c

@@ -122 +122 @@
                                                                         &id, &len, &secure, &port, &l4, &proto),
                                                         {
-                                                                TRACE_DEBUG(INFO, "Received an invalid Redirect-Host AVP value ('%.*s'), ignored", ahdr->avp_value->os.len, ahdr->avp_value->os.data);
+                                                                TRACE_DEBUG(INFO, "Received an invalid Redirect-Host AVP value ('%.*s'), ignored", (int)ahdr->avp_value->os.len, ahdr->avp_value->os.data);
                                                                 break;
                                                         } );
@@ -128 +128 @@
                                                 /* Now check if the transport & protocol are supported */
                                                 if (proto && (proto != 'd')) {
-                                                        TRACE_DEBUG(FULL, "Ignored unsupported non-Diameter Redirect-Host AVP (%.*s)", ahdr->avp_value->os.len, ahdr->avp_value->os.data);
+                                                        TRACE_DEBUG(FULL, "Ignored unsupported non-Diameter Redirect-Host AVP (%.*s)", (int)ahdr->avp_value->os.len, ahdr->avp_value->os.data);
                                                         free(id);
                                                         break;
                                                 }
                                                 if (l4 && (l4 == IPPROTO_UDP)) {
-                                                        TRACE_DEBUG(FULL, "Ignored unsupported UDP Redirect-Host AVP (%.*s)", ahdr->avp_value->os.len, ahdr->avp_value->os.data);
+                                                        TRACE_DEBUG(FULL, "Ignored unsupported UDP Redirect-Host AVP (%.*s)", (int)ahdr->avp_value->os.len, ahdr->avp_value->os.data);
                                                         free(id);
                                                         break;

extensions/rt_redirect/redir_out.c

@@ -173 +173 @@
                         cmp = fd_os_almostcasesrch(cand->diamid, cand->diamidlen, e->data.host.s, e->data.host.l, NULL);
                         if (!cmp) {
-                                TRACE_DEBUG(FULL, "Redirect msg %p: peer '%.*s' += %d (previous ALL_HOST Redirect originated from this peer)", msg, cand->diamidlen, cand->diamid, FD_SCORE_SENT_REDIRECT);
+                                TRACE_DEBUG(FULL, "Redirect msg %p: peer '%.*s' += %d (previous ALL_HOST Redirect originated from this peer)", msg, (int)cand->diamidlen, cand->diamid, FD_SCORE_SENT_REDIRECT);
                                 cand->score += FD_SCORE_SENT_REDIRECT;
                                 c_oh = cand;
@@ -182 +182 @@
                 cmp = fd_os_cmp(cand->diamid, cand->diamidlen, e->from.s, e->from.l);
                 if (!cmp) {
-                        TRACE_DEBUG(FULL, "Redirect msg %p: peer '%.*s' += %d (previous Redirect received from this peer)", msg, cand->diamidlen, cand->diamid, FD_SCORE_SENT_REDIRECT);
+                        TRACE_DEBUG(FULL, "Redirect msg %p: peer '%.*s' += %d (previous Redirect received from this peer)", msg, (int)cand->diamidlen, cand->diamid, FD_SCORE_SENT_REDIRECT);
                         cand->score += FD_SCORE_SENT_REDIRECT;
                 }
@@ -206 +206 @@
                         
                         if (cmp == 0) {
-                                TRACE_DEBUG(FULL, "Redirect msg %p: peer '%.*s' += %d (rule t:%d @%p)", msg, cand->diamidlen, cand->diamid, redirects_usages[e->type].score, e->type, e);
+                                TRACE_DEBUG(FULL, "Redirect msg %p: peer '%.*s' += %d (rule t:%d @%p)", msg, (int)cand->diamidlen, cand->diamid, redirects_usages[e->type].score, e->type, e);
                                 cand->score += redirects_usages[e->type].score;
                                 break;