denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel-pfroute: Alignment of sockaddrs is not always the same

Browse Source
This commit is contained in:
Tobias Brunner
2013-06-21 17:03:22 +02:00
parent aa33d2e6eb
commit 4b3fea3d54
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c
+8 -1
View File
@@ -41,7 +41,13 @@
#endif #endif
/** properly align sockaddrs */ /** properly align sockaddrs */
#ifdef __APPLE__
/* Apple always uses 4 bytes */
#define SA_ALIGN 4 #define SA_ALIGN 4
#else
/* while on other platforms like FreeBSD it depends on the architecture */
#define SA_ALIGN sizeof(long)
#endif
#define SA_LEN(len) ((len) > 0 ? (((len)+SA_ALIGN-1) & ~(SA_ALIGN-1)) : SA_ALIGN) #define SA_LEN(len) ((len) > 0 ? (((len)+SA_ALIGN-1) & ~(SA_ALIGN-1)) : SA_ALIGN)
/** delay before firing roam events (ms) */ /** delay before firing roam events (ms) */
@@ -349,7 +355,8 @@ METHOD(enumerator_t, rt_enumerate, bool,
*addr = this->addr; *addr = this->addr;
*xtype = i; *xtype = i;
this->remaining -= SA_LEN(this->addr->sa_len); this->remaining -= SA_LEN(this->addr->sa_len);
this->addr = (char*)this->addr + SA_LEN(this->addr->sa_len); this->addr = (struct sockaddr*)((char*)this->addr +
SA_LEN(this->addr->sa_len));
return TRUE; return TRUE;
} }
} }