oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(sockaddr_storage): change padding so that we have one char[] of pad

Browse Source 
and then an unsigned long[] (for alignment and padding).  this works
much better in practice.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7685 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-12-30 02:22:54 +00:00
parent 90200a32be
commit 9e9d385daa
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/roken/roken.h.in
View File

@@ -448,27 +448,29 @@ typedef unsigned short sa_family_t;
#if HAVE_STRUCT_SOCKADDR_SA_LEN #if HAVE_STRUCT_SOCKADDR_SA_LEN
#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof (sa_family_t) - sizeof(unsigned char)) typedef unsigned char roken_sa_family_t;
#define _SS_PAD2SIZE (_SS_MAXSIZE - (sizeof (sa_family_t) + _SS_PAD1SIZE + _SS_ALIGNSIZE))
#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof (roken_sa_family_t) - sizeof(unsigned char))
#define _SS_PAD2SIZE (_SS_MAXSIZE - (sizeof (roken_sa_family_t) + sizeof(unsigned char) + _SS_PAD1SIZE + _SS_ALIGNSIZE))
struct sockaddr_storage { struct sockaddr_storage {
unsigned char ss_len; unsigned char ss_len;
sa_family_t ss_family; roken_sa_family_t ss_family;
char __ss_pad1[_SS_PAD1SIZE]; char __ss_pad1[_SS_PAD1SIZE];
unsigned long __ss_align; unsigned long __ss_align[_SS_PAD2SIZE / sizeof(unsigned long) + 1];
char __ss_pad2[_SS_PAD2SIZE];
}; };
#else /* !HAVE_STRUCT_SOCKADDR_SA_LEN */ #else /* !HAVE_STRUCT_SOCKADDR_SA_LEN */
#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof (sa_family_t)) typedef unsigned short roken_sa_family_t;
#define _SS_PAD2SIZE (_SS_MAXSIZE - (sizeof (sa_family_t) + _SS_PAD1SIZE + _SS_ALIGNSIZE))
#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof (roken_sa_family_t))
#define _SS_PAD2SIZE (_SS_MAXSIZE - (sizeof (roken_sa_family_t) + _SS_PAD1SIZE + _SS_ALIGNSIZE))
struct sockaddr_storage { struct sockaddr_storage {
sa_family_t ss_family; roken_sa_family_t ss_family;
char __ss_pad1[_SS_PAD1SIZE]; char __ss_pad1[_SS_PAD1SIZE];
unsigned long __ss_align; unsigned long __ss_align[_SS_PAD2SIZE / sizeof(unsigned long) + 1];
char __ss_pad2[_SS_PAD2SIZE];
}; };
#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */ #endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */