Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add IPv6 support to NFLOG #1375

Merged
merged 2 commits into from
Mar 4, 2024
Merged

Add IPv6 support to NFLOG #1375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b5d4b6
All external binaries/platforms are now compiled with API 21.
NeroProtagonist Mar 1, 2024
d82f662
Merge branch 'ukanth:beta' into nflogIPv6
NeroProtagonist Mar 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified app/src/main/res/raw/nflog_arm
View file
Open in desktop
Binary file not shown.
Binary file modified app/src/main/res/raw/nflog_mips
View file
Open in desktop
Binary file not shown.
Binary file modified app/src/main/res/raw/nflog_x86
View file
Open in desktop
Binary file not shown.
10 changes: 4 additions & 6 deletions external/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,20 @@ GCCVER := 4.9

# You should be able to just 'make ARCH=x86' and it should DTRT.
ARCH_LIST := arm x86 mips
#ARCH_LIST := arm
APIVER := 21
ifeq ($(ARCH),arm)
TRIPLET := arm-linux-androideabi
TOOLCHAIN := $(TRIPLET)-$(GCCVER)
APIVER := 8
NDK_ABINAME := armeabi
endif
ifeq ($(ARCH),x86)
TRIPLET := i686-linux-android
TOOLCHAIN := x86-$(GCCVER)
APIVER := 9
NDK_ABINAME := x86
endif
ifeq ($(ARCH),mips)
TRIPLET := mipsel-linux-android
TOOLCHAIN := $(TRIPLET)-$(GCCVER)
APIVER := 9
NDK_ABINAME := mips
endif

Expand Down Expand Up @@ -126,9 +123,10 @@ busybox-unpack: $(BUSYBOX_BUILD)/.configured
#
NDK_OUTDIR := ../libs/$(NDK_ABINAME)

$(NDK_OUTDIR)/nflog:
ndk-build APP_ABI=$(NDK_ABINAME)
$(NDK_OUTDIR)/nflog: .FORCE
ndk-build APP_ABI=$(NDK_ABINAME) APP_PLATFORM=$(APIVER) NDK_TOOLCHAIN=$(TOOLCHAIN)

.FORCE:
.PHONY: nflog nflog-unpack
nflog: $(NDK_OUTDIR)/nflog
cp $< $(RESDIR)/nflog_$(ARCH)
Expand Down
138 changes: 99 additions & 39 deletions external/nflog/nflog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@
#include <linux/netfilter.h>
#include <linux/netfilter/nfnetlink.h>
#include <linux/ip.h>
#include <linux/in.h>
#include <linux/if.h>
#include <linux/ipv6.h>
#include <linux/tcp.h>
#include <linux/udp.h>
#include <linux/icmp.h>
#include <net/if.h>
#include <linux/icmpv6.h>
#include <linux/if_ether.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/select.h>
Expand Down Expand Up @@ -48,6 +52,12 @@ static int parse_attr_cb(const struct nlattr *attr, void *data)
return MNL_CB_OK;

switch(type) {
case NFULA_HWTYPE:
if (mnl_attr_validate(attr, MNL_TYPE_U16) < 0) {
perror("mnl_attr_validate");
return MNL_CB_ERROR;
}
break;
case NFULA_MARK:
case NFULA_IFINDEX_INDEV:
case NFULA_IFINDEX_OUTDEV:
Expand All @@ -72,6 +82,13 @@ static int parse_attr_cb(const struct nlattr *attr, void *data)
return MNL_CB_ERROR;
}
break;
case NFULA_PACKET_HDR:
if (mnl_attr_validate2(attr, MNL_TYPE_UNSPEC,
sizeof(struct nfulnl_msg_packet_hdr)) < 0) {
perror("mnl_attr_validate");
return MNL_CB_ERROR;
}
break;
case NFULA_PREFIX:
if (mnl_attr_validate(attr, MNL_TYPE_NUL_STRING) < 0) {
perror("mnl_attr_validate");
Expand Down Expand Up @@ -173,48 +190,91 @@ static int log_cb(const struct nlmsghdr *nlh, void *data)
printf("OUT= ");
}

uint16_t hwProtocol = 0;
if (tb[NFULA_PACKET_HDR]) {
struct nfulnl_msg_packet_hdr* pktHdr = (struct nfulnl_msg_packet_hdr*)mnl_attr_get_payload(tb[NFULA_PACKET_HDR]);
hwProtocol = ntohs(pktHdr->hw_protocol);
}

if (tb[NFULA_PAYLOAD]) {
struct iphdr *iph = (struct iphdr *) mnl_attr_get_payload(tb[NFULA_PAYLOAD]);

printf("SRC=%u.%u.%u.%u DST=%u.%u.%u.%u ",
((unsigned char *)&iph->saddr)[0],
((unsigned char *)&iph->saddr)[1],
((unsigned char *)&iph->saddr)[2],
((unsigned char *)&iph->saddr)[3],
((unsigned char *)&iph->daddr)[0],
((unsigned char *)&iph->daddr)[1],
((unsigned char *)&iph->daddr)[2],
((unsigned char *)&iph->daddr)[3]);

printf("LEN=%u ", ntohs(iph->tot_len));

switch(iph->protocol)
{
case IPPROTO_TCP:
{
struct tcphdr *th = (struct tcphdr *) ((__u32 *) iph + iph->ihl);
printf("PROTO=TCP SPT=%u DPT=%u ",
ntohs(th->source), ntohs(th->dest));
break;
}
case IPPROTO_UDP:
{
struct udphdr *uh = (struct udphdr *) ((__u32 *) iph + iph->ihl);
printf("PROTO=UDP SPT=%u DPT=%u LEN=%u ",
ntohs(uh->source), ntohs(uh->dest), ntohs(uh->len));
break;
}
case IPPROTO_ICMP:

switch (hwProtocol) {
case ETH_P_IP: {
struct iphdr *iph = (struct iphdr *) mnl_attr_get_payload(tb[NFULA_PAYLOAD]);

char addressStr[INET_ADDRSTRLEN];
inet_ntop(AF_INET, &iph->saddr, addressStr, sizeof(addressStr));
printf("SRC=%s ", addressStr);
inet_ntop(AF_INET, &iph->daddr, addressStr, sizeof(addressStr));
printf("DST=%s ", addressStr);

printf("LEN=%u ", ntohs(iph->tot_len));

switch(iph->protocol)
{
struct icmphdr *ich = (struct icmphdr *) ((__u32 *) iph + iph->ihl);
printf("PROTO=ICMP TYPE=%u CODE=%u ",
ich->type, ich->code);
break;
case IPPROTO_TCP:
{
struct tcphdr *th = (struct tcphdr *) ((__u32 *) iph + iph->ihl);
printf("PROTO=TCP SPT=%u DPT=%u ",
ntohs(th->source), ntohs(th->dest));
break;
}
case IPPROTO_UDP:
{
struct udphdr *uh = (struct udphdr *) ((__u32 *) iph + iph->ihl);
printf("PROTO=UDP SPT=%u DPT=%u LEN=%u ",
ntohs(uh->source), ntohs(uh->dest), ntohs(uh->len));
break;
}
case IPPROTO_ICMP:
{
struct icmphdr *ich = (struct icmphdr *) ((__u32 *) iph + iph->ihl);
printf("PROTO=ICMP TYPE=%u CODE=%u ",
ich->type, ich->code);
break;
}
default:
{
printf("PROTO=%u ", iph->protocol);
}
}
default:
{
printf("PROTO=%u ", iph->protocol);
break;
}
case ETH_P_IPV6: {
struct ipv6hdr *iph = (struct ipv6hdr *) mnl_attr_get_payload(tb[NFULA_PAYLOAD]);

char addressStr[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, &iph->saddr, addressStr, sizeof(addressStr));
printf("SRC=%s ", addressStr);
inet_ntop(AF_INET6, &iph->daddr, addressStr, sizeof(addressStr));
printf("DST=%s ", addressStr);

switch (iph->nexthdr) {
case IPPROTO_TCP: {
struct tcphdr *th = (struct tcphdr *) ((uint8_t*) iph + sizeof(*iph));
printf("PROTO=TCP SPT=%u DPT=%u ",
ntohs(th->source), ntohs(th->dest));
break;
}
case IPPROTO_UDP: {
struct udphdr *uh = (struct udphdr *) ((uint8_t *) iph + sizeof(*iph));
printf("PROTO=UDP SPT=%u DPT=%u LEN=%u ",
ntohs(uh->source), ntohs(uh->dest), ntohs(uh->len));
break;
}
case IPPROTO_ICMPV6: {
struct icmp6hdr *icmpv6h = (struct icmp6hdr *) ((uint8_t *) iph + sizeof(*iph));
printf("PROTO=ICMP6 TYPE=%u CODE=%u ", icmpv6h->icmp6_type, icmpv6h->icmp6_code);
break;
}
default: {
printf("PROTO=%d ", iph->nexthdr);
break;
}
}
}
default:
break;
}
}

Expand Down
2 changes: 1 addition & 1 deletion jni/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
APP_BUILD_SCRIPT = $(APP_PROJECT_PATH)/external/Android.mk
APP_PLATFORM = android-8
#APP_PLATFORM = android-21
Loading