Commit 22947395 authored by Håvard Moås's avatar Håvard Moås
Browse files

Update IPFIXLIB to fix compilation error in util.c, havard.mork@gmail.com

git-svn-id: file:///home/svn/mapi/branches/haavardm-mapi@114 8d5bb341-7cf1-0310-8cf6-ba355fef3186
parent c6a0f865
......@@ -894,9 +894,10 @@ static void copyIpV6(struct in6_addr ipv6, char *outBuffer, int *outBufferBegin,
copyLen((char*)&ipv6, sizeof(ipv6), outBuffer, outBufferBegin, outBufferMax);
}
static void copyIpAddress(u_int8_t version, struct IpAddress &ipaddr, char *outBuffer, int *outBufferBegin, int *outBufferMax) {
static void copyIpAddress(u_int8_t version, IpAddress ipaddr, char *outBuffer, int *outBufferBegin, int *outBufferMax) {
int strLen = (version==6)?sizeof(ipaddr.ipType.ipv6):sizeof(ipaddr.ipType.ipv4);
if(ipaddr.ipVersion==version)
copyLen((char*)((version==6)?(&ipaddr.ipType.ipv6):(&ipaddr.ipType.ipv4)),
copyLen(((version==6)?((char*)&ipaddr.ipType.ipv6):((char*)&ipaddr.ipType.ipv4)),
(version==6)?sizeof(ipaddr.ipType.ipv6):sizeof(ipaddr.ipType.ipv4),
outBuffer, outBufferBegin, outBufferMax);
else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment