From b0ef0da1e799f3bb0c0f4ae6b3e8534448f12721 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Wed, 14 Dec 2011 12:52:28 +0000 Subject: [PATCH] change the daemon to the new interface, this should make jenkins happy again --- daemon/call.h | 2 +- daemon/kernel.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/daemon/call.h b/daemon/call.h index f55b0f47f..3c15a4208 100644 --- a/daemon/call.h +++ b/daemon/call.h @@ -10,7 +10,7 @@ #include #endif #include -#include "ipt_MEDIAPROXY.h" +#include "xt_MEDIAPROXY.h" diff --git a/daemon/kernel.c b/daemon/kernel.c index 64d1e9858..939dec424 100644 --- a/daemon/kernel.c +++ b/daemon/kernel.c @@ -6,7 +6,7 @@ #include #include -#include "ipt_MEDIAPROXY.h" +#include "xt_MEDIAPROXY.h" #include "aux.h" #include "kernel.h" @@ -77,12 +77,12 @@ int kernel_add_stream(int fd, struct kernel_stream *info, int update) { ZERO(msg); msg.cmd = update ? MMG_UPDATE : MMG_ADD; msg.target.target_port = info->local_port; - msg.target.src_ip = info->src.ip; - msg.target.dst_ip = info->dest.ip; - msg.target.src_port = info->src.port; - msg.target.dst_port = info->dest.port; - msg.target.mirror_ip = info->mirror.ip; - msg.target.mirror_port = info->mirror.port; + msg.target.src_addr.ipv4 = info->src.ip; + msg.target.src_addr.port = info->src.port; + msg.target.dst_addr.ipv4 = info->dest.ip; + msg.target.dst_addr.port = info->dest.port; + msg.target.mirror_addr.ipv4 = info->mirror.ip; + msg.target.mirror_addr.port = info->mirror.port; msg.target.tos = info->tos; return write(fd, &msg, sizeof(msg)) <= 0 ? -1 : 0;