Changeset 518:2c097ed9d0ea in freeDiameter

Timestamp:

Aug 27, 2010, 11:25:46 AM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Fix the dump function

Location:

extensions/app_radgw

Files:

• radius.c (modified) (4 diffs)
• rgw_msg.c (modified) (1 diff)

extensions/app_radgw/radius.c

@@ -224 +224 @@
         int i, len;
         unsigned char *pos;
+        u8 attrtype;
 
         attr = radius_get_attr_type(hdr->type);
 
         if (attr == NULL)
-                return;
+                attrtype = RADIUS_ATTR_HEXDUMP;
+        else
+                attrtype = attr->data_type;
 
         len = hdr->length - sizeof(struct radius_attr_hdr);
         pos = (unsigned char *) (hdr + 1);
 
-        switch (attr->data_type) {
+        switch (attrtype) {
         case RADIUS_ATTR_TEXT:
                 printf("      Value: '");
@@ -250 +253 @@
                 break;
 
-#ifdef CONFIG_IPV6
         case RADIUS_ATTR_IPV6:
                 if (len == 16) {
@@ -261 +263 @@
                         printf("      Invalid IPv6 address length %d\n", len);
                 break;
-#endif /* CONFIG_IPV6 */
-
-        case RADIUS_ATTR_HEXDUMP:
-        case RADIUS_ATTR_UNDIST:
-                printf("      Value:");
-                for (i = 0; i < len; i++)
-                        printf(" %02x", pos[i]);
-                printf("\n");
-                break;
 
         case RADIUS_ATTR_INT32:
@@ -278 +271 @@
                 break;
 
+        case RADIUS_ATTR_HEXDUMP:
+        case RADIUS_ATTR_UNDIST:
         default:
+                printf("      Value:");
+                for (i = 0; i < len; i++)
+                        printf(" %02x", pos[i]);
+                printf("\n");
                 break;
         }

extensions/app_radgw/rgw_msg.c

@@ -99 +99 @@
         for (i = 0; i < msg->radius.attr_used; i++) {
                 struct radius_attr_hdr *attr = (struct radius_attr_hdr *)(msg->radius.buf + msg->radius.attr_pos[i]);
-                fd_log_debug("    - type: 0x%02hhx (%s)\n       len: %3hhu,", attr->length, attr->type, rgw_msg_attrtype_str(attr->type));
+                fd_log_debug("    - Type: 0x%02hhx (%s)\n       Len: %-3hhu", attr->type, rgw_msg_attrtype_str(attr->type), attr->length);
                 radius_msg_dump_attr_val(attr);
         }