Changeset 1414:f6f12521c2aa in freeDiameter

Timestamp:

Feb 18, 2020, 5:01:49 PM (4 years ago)

Author:

Luke Mewburn <luke@mewburn.net>

Branch:

default

Phase:

public

committer:

Luke Mewburn <luke@mewburn.net> 1582020002 -39600

Message:

Fix strict-aliasing warnings with gcc 4.8

Rewrite IN6_ADDR_V4MAP() to not rely upon aliasing rules.
Add test for IN6_ADDR_V4MAP() and IN6_ADDR_V4UNMAP().

Rewrite MD5Final() to not rely upon aliasing rules. (Not tested)

Files:

• extensions/app_radgw/md5.c (modified) (1 diff)
• extensions/app_sip/md5.c (modified) (1 diff)
• include/freeDiameter/libfdproto.h (modified) (1 diff)
• tests/testmesg.c (modified) (1 diff)

extensions/app_radgw/md5.c

@@ -287 +287 @@
 
     /* Append length in bits and transform */
-    ((u32 *) ctx->in)[14] = ctx->bits[0];
-    ((u32 *) ctx->in)[15] = ctx->bits[1];
+    os_memcpy(&ctx->in[56], &ctx->bits[0], 8);
 
     MD5Transform(ctx->buf, (u32 *) ctx->in);

extensions/app_sip/md5.c

@@ -310 +310 @@
 
     /* Append length in bits and transform */
-    ((u32 *) ctx->in)[14] = ctx->bits[0];
-    ((u32 *) ctx->in)[15] = ctx->bits[1];
+    os_memcpy(&ctx->in[56], &ctx->bits[0], 8);
 
     MD5Transform(ctx->buf, (u32 *) ctx->in);

include/freeDiameter/libfdproto.h

@@ -690 +690 @@
 /* create a V4MAPPED address */
 #define IN6_ADDR_V4MAP( a6, a4 ) {                      \
-        ((uint32_t *)(a6))[0] = 0;                      \
-        ((uint32_t *)(a6))[1] = 0;                      \
-        ((uint32_t *)(a6))[2] = htonl(0xffff);          \
-        ((uint32_t *)(a6))[3] = (uint32_t)(a4);         \
+        memset(&(*a6)[0], 0, 10);                       \
+        (*a6)[10] = 0xff;                               \
+        (*a6)[11] = 0xff;                               \
+        memcpy(&(*a6)[12], &a4, 4);                     \
 }
 

tests/testmesg.c

@@ -1449 +1449 @@
                 }
         }
+
+        /* Check IPv4 -> IPv6 and IPv6->IPv4 mapping */
+        {
+                struct in_addr i4;
+                memset(&i4, 0xff, sizeof(i4));
+                CHECK( 1, inet_pton( AF_INET, TEST_IP4, &i4 ) );
+
+                #define TEST_IP6MAP "::ffff:" TEST_IP4
+
+                struct in6_addr i6;
+                memset(&i6, 0xff, sizeof(i6));
+                IN6_ADDR_V4MAP(&i6.s6_addr, i4.s_addr);
+                char buf6[INET6_ADDRSTRLEN];
+                CHECK( 0, (inet_ntop( AF_INET6, &i6, buf6, sizeof(buf6) ) == NULL) ? errno : 0 );
+                LOG_D("buf6='%s'", buf6);
+                CHECK( 0, strcasecmp( buf6, TEST_IP6MAP ) );
+
+                struct in_addr o4;
+                o4.s_addr = IN6_ADDR_V4UNMAP(&i6);
+                char buf4[INET_ADDRSTRLEN];
+                CHECK( 0, (inet_ntop( AF_INET, &o4.s_addr, buf4, sizeof(buf4) ) == NULL) ? errno : 0 );
+                CHECK( 0, strcmp( buf4, TEST_IP4 ) );
+        }
         
         /* That's all for the tests yet */