Changeset 486:65efe8ff2c30 in freeDiameter

Timestamp:

Aug 11, 2010, 4:13:51 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Change creation of anciliary data to avoid padding, should close #12

File:

• freeDiameter/sctp.c (modified) (3 diffs)

freeDiameter/sctp.c

@@ -1001 +1001 @@
         struct msghdr mhdr;
         struct iovec  iov;
-        struct {
-                struct cmsghdr          hdr;
-                struct sctp_sndrcvinfo  sndrcv;
-        } anci;
+        struct cmsghdr          *hdr;
+        struct sctp_sndrcvinfo  *sndrcv;
+        uint8_t anci[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))];
         ssize_t ret;
         int timedout = 0;
@@ -1020 +1019 @@
         
         /* Anciliary data: specify SCTP stream */
-        anci.hdr.cmsg_len   = sizeof(anci);
-        anci.hdr.cmsg_level = IPPROTO_SCTP;
-        anci.hdr.cmsg_type  = SCTP_SNDRCV;
-        anci.sndrcv.sinfo_stream = strid;
+        hdr = (struct cmsghdr *)anci;
+        sndrcv = (struct sctp_sndrcvinfo *)CMSG_DATA(hdr);
+        hdr->cmsg_len   = sizeof(anci);
+        hdr->cmsg_level = IPPROTO_SCTP;
+        hdr->cmsg_type  = SCTP_SNDRCV;
+        sndrcv->sinfo_stream = strid;
         /* note : we could store other data also, for example in .sinfo_ppid for remote peer or in .sinfo_context for errors. */
         
@@ -1031 +1032 @@
         mhdr.msg_iovlen = 1;
         
-        mhdr.msg_control    = &anci;
+        mhdr.msg_control    = anci;
         mhdr.msg_controllen = sizeof(anci);