Skip to content

add pcap option outbound=on to sample outbound packet only #35

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

Open
setup74 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add pcap option outbound=on to sample outbound packet only #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Linux/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ EAPI: mod_eapi.so
######### hsflowd #########

hsflowd: $(OBJS_HSFLOWD) $(HEADERS)
$(CC) $(CFLAGS) -o $@ $(OBJS_HSFLOWD) mod_docker.o $(LIBS) $(LIBS_HSFLOWD) -rdynamic
$(CC) $(CFLAGS) -o $@ $(OBJS_HSFLOWD) $(LIBS) $(LIBS_HSFLOWD) -rdynamic

######## DBUS utils ##########

Expand Down
3 changes: 3 additions & 0 deletions src/Linux/hsflowconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1597,6 +1597,9 @@ extern "C" {
if((tok = expectIntegerRange64(sp, tok, &pc->speed_min, &pc->speed_max, 0, LLONG_MAX)) == NULL) return NO;
pc->speed_set = YES;
break;
case HSPTOKEN_OUTBOUND_ONLY:
if((tok = expectONOFF(sp, tok, &pc->outbound_only)) == NULL) return NO;
break;
default:
unexpectedToken(sp, tok, level[depth]);
return NO;
Expand Down
1 change: 1 addition & 0 deletions src/Linux/hsflowd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ extern "C" {
uint64_t speed_min;
uint64_t speed_max;
bool speed_set;
bool outbound_only;
} HSPPcap;

typedef struct _HSPPort {
Expand Down
1 change: 1 addition & 0 deletions src/Linux/hsflowtokens.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ HSPTOKEN_DATA( HSPTOKEN_DEV, "dev", HSPTOKENTYPE_ATTRIB, NULL)
HSPTOKEN_DATA( HSPTOKEN_SPEED, "speed", HSPTOKENTYPE_ATTRIB, NULL)
HSPTOKEN_DATA( HSPTOKEN_PROMISC, "promisc", HSPTOKENTYPE_ATTRIB, NULL)
HSPTOKEN_DATA( HSPTOKEN_VPORT, "vport", HSPTOKENTYPE_ATTRIB, NULL)
HSPTOKEN_DATA( HSPTOKEN_OUTBOUND_ONLY, "outbound_only", HSPTOKENTYPE_ATTRIB, NULL)
HSPTOKEN_DATA( HSPTOKEN_KVM, "kvm", HSPTOKENTYPE_OBJ, NULL)
HSPTOKEN_DATA( HSPTOKEN_XEN, "xen", HSPTOKENTYPE_OBJ, NULL)
HSPTOKEN_DATA( HSPTOKEN_XEN_UPDATE_DOMINFO, "xen.update.dominfo", HSPTOKENTYPE_ATTRIB, "xen { update.dominfo=[on|off] }")
Expand Down
26 changes: 20 additions & 6 deletions src/Linux/mod_pcap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ extern "C" {
bool promisc:1;
bool vport:1;
bool vport_set:1;
bool outbound_only:1;
pcap_t *pcap;
char pcap_err[PCAP_ERRBUF_SIZE];
} BPFSoc;
Expand Down Expand Up @@ -197,6 +198,10 @@ extern "C" {
}

struct sock_filter code[] = {
// for outbound_only check
{ 0x28, 0, 0, 0xfffff004 }, // ld direction
{ 0x15, 0, 4, 0x00000004 }, // true:outbound, false:inbound
// for stochastic sampling
{ 0x20, 0, 0, 0xfffff038 }, // ld rand
{ 0x94, 0, 0, 0x00000100 }, // mod #256
{ 0x15, 0, 1, 0x00000001 }, // jneq #1, drop
Expand All @@ -205,12 +210,20 @@ extern "C" {
};

// overwrite the sampling-rate
code[1].k = bpfs->samplingRate;
myDebug(1, "PCAP: sampling rate set to %u for dev=%s", code[1].k, bpfs->deviceName);
struct sock_fprog bpf = {
.len = 5, // ARRAY_SIZE(code),
.filter = code,
};
code[3].k = bpfs->samplingRate;
myDebug(1, "PCAP: sampling rate set to %u for dev=%s", code[3].k, bpfs->deviceName);

// set filter code range for outboud_only or all
struct sock_fprog bpf = { 0, 0 };
if (bpfs->outbound_only) {
bpf.len = 7;
bpf.filter = code;
}
else {
bpf.len = 5;
bpf.filter = code + 2;
}
myDebug(1, "PCAP: sampling outbound_only=%s", bpfs->outbound_only? "on" : "off");

// install the sock_filter directly, rather than using pcap_setfilter()
int status = setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &bpf, sizeof(bpf));
Expand Down Expand Up @@ -307,6 +320,7 @@ extern "C" {
bpfs->promisc = pcap->promisc;
bpfs->vport = pcap->vport;
bpfs->vport_set = pcap->vport_set;
bpfs->outbound_only = pcap->outbound_only;
tap_open(mod, bpfs);
}

Expand Down