summaryrefslogtreecommitdiffstats
path: root/filter
diff options
context:
space:
mode:
authorlaforge <laforge>2005-11-20 14:16:30 +0000
committerlaforge <laforge>2005-11-20 14:16:30 +0000
commitb25637a58e9ab853ac410fcd823546256ab3002b (patch)
tree5fcee055efd0b8109f0fcb2e3e3fe33bb5765b05 /filter
parente6459a06dbc4057ec1680c76075bc12c1774d385 (diff)
make 'num_keys' an attribute of pluginstance instead of plugin
Diffstat (limited to 'filter')
-rw-r--r--filter/raw2packet/ulogd_raw2packet_BASE.c27
-rw-r--r--filter/ulogd_filter_IFINDEX.c4
-rw-r--r--filter/ulogd_filter_PWSNIFF.c8
3 files changed, 22 insertions, 17 deletions
diff --git a/filter/raw2packet/ulogd_raw2packet_BASE.c b/filter/raw2packet/ulogd_raw2packet_BASE.c
index 38be028..ca67677 100644
--- a/filter/raw2packet/ulogd_raw2packet_BASE.c
+++ b/filter/raw2packet/ulogd_raw2packet_BASE.c
@@ -339,8 +339,9 @@ static struct ulogd_key iphdr_rets[] = {
static int _interp_tcp(struct ulogd_pluginstance *pi)
{
- struct ulogd_key *ret = &pi->output[10];
- struct iphdr *iph = (struct iphdr *) pi->input[0].u.source->u.value.ptr;
+ struct ulogd_key *ret = &pi->output.keys[10];
+ struct iphdr *iph = (struct iphdr *)
+ pi->input.keys[0].u.source->u.value.ptr;
void *protoh = (u_int32_t *)iph + iph->ihl;
struct tcphdr *tcph = (struct tcphdr *) protoh;
@@ -395,8 +396,9 @@ static int _interp_tcp(struct ulogd_pluginstance *pi)
static int _interp_udp(struct ulogd_pluginstance *pi)
{
- struct ulogd_key *ret = &pi->output[27];
- struct iphdr *iph = (struct iphdr *) pi->input[0].u.source->u.value.ptr;
+ struct ulogd_key *ret = &pi->output.keys[27];
+ struct iphdr *iph = (struct iphdr *)
+ pi->input.keys[0].u.source->u.value.ptr;
void *protoh = (u_int32_t *)iph + iph->ihl;
struct udphdr *udph = protoh;
@@ -421,8 +423,9 @@ static int _interp_udp(struct ulogd_pluginstance *pi)
static int _interp_icmp(struct ulogd_pluginstance *pi)
{
- struct ulogd_key *ret = &pi->output[31];
- struct iphdr *iph = (struct iphdr *) pi->input[0].u.source->u.value.ptr;
+ struct ulogd_key *ret = &pi->output.keys[31];
+ struct iphdr *iph = (struct iphdr *)
+ pi->input.keys[0].u.source->u.value.ptr;
void *protoh = (u_int32_t *)iph + iph->ihl;
struct icmphdr *icmph = protoh;
@@ -466,8 +469,9 @@ static int _interp_icmp(struct ulogd_pluginstance *pi)
static int _interp_ahesp(struct ulogd_pluginstance *pi)
{
- struct ulogd_key *ret = &pi->output[38];
- struct iphdr *iph = (struct iphdr *) pi->input[0].u.source->u.value.ptr;
+ struct ulogd_key *ret = &pi->output.keys[38];
+ struct iphdr *iph = (struct iphdr *)
+ pi->input.keys[0].u.source->u.value.ptr;
void *protoh = (u_int32_t *)iph + iph->ihl;
#if 0
@@ -480,13 +484,14 @@ static int _interp_ahesp(struct ulogd_pluginstance *pi)
ret[0].flags |= ULOGD_RETF_VALID;
#endif
- return ret;
+ return 0;
}
static int _interp_iphdr(struct ulogd_pluginstance *pi)
{
- struct ulogd_key *ret = pi->output;
- struct iphdr *iph = (struct iphdr *) pi->input[0].u.source->u.value.ptr;
+ struct ulogd_key *ret = pi->output.keys;
+ struct iphdr *iph = (struct iphdr *)
+ pi->input.keys[0].u.source->u.value.ptr;
ret[0].u.value.ui32 = ntohl(iph->saddr);
ret[0].flags |= ULOGD_RETF_VALID;
diff --git a/filter/ulogd_filter_IFINDEX.c b/filter/ulogd_filter_IFINDEX.c
index dc4ea46..886592b 100644
--- a/filter/ulogd_filter_IFINDEX.c
+++ b/filter/ulogd_filter_IFINDEX.c
@@ -54,8 +54,8 @@ static struct ulogd_key ifindex_inp[] = {
static int interp_ifindex(struct ulogd_pluginstance *pi)
{
- struct ulogd_key *ret = pi->output;
- struct ulogd_key *inp = pi->input;
+ struct ulogd_key *ret = pi->output.keys;
+ struct ulogd_key *inp = pi->input.keys;
ret[0].u.value.ptr = ifindex_2name(inp[0].u.source->u.value.ui32);
ret[0].flags |= ULOGD_RETF_VALID;
diff --git a/filter/ulogd_filter_PWSNIFF.c b/filter/ulogd_filter_PWSNIFF.c
index 2296929..7e417da 100644
--- a/filter/ulogd_filter_PWSNIFF.c
+++ b/filter/ulogd_filter_PWSNIFF.c
@@ -60,8 +60,8 @@ static unsigned char *_get_next_blank(unsigned char* begp, unsigned char *endp)
static int interp_pwsniff(struct ulogd_pluginstance *pi)
{
- struct ulogd_key *inp = pi->input;
- struct ulogd_key *ret = pi->output;
+ struct ulogd_key *inp = pi->input.keys;
+ struct ulogd_key *ret = pi->output.keys;
struct iphdr *iph;
void *protoh;
struct tcphdr *tcph;
@@ -69,10 +69,10 @@ static int interp_pwsniff(struct ulogd_pluginstance *pi)
unsigned char *ptr, *begp, *pw_begp, *endp, *pw_endp;
int len, pw_len, i, cont = 0;
- if (!IS_VALID(pi->input[0]))
+ if (!IS_VALID(pi->input.keys[0]))
return 0;
- iph = (struct iphdr *) pi->input[0].u.value.ptr;
+ iph = (struct iphdr *) pi->input.keys[0].u.value.ptr;
protoh = (u_int32_t *)iph + iph->ihl;
tcph = protoh;
tcplen = ntohs(iph->tot_len) - iph->ihl * 4;