From dfc9dd862063a91089e05b39be52ce3f672950e0 Mon Sep 17 00:00:00 2001 From: Sergey Nazaryev Date: Wed, 7 Nov 2018 02:02:09 +0000 Subject: =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BB=20packet=5Fhandler=20=E2=86=92=20xdp=5Fpacke?= =?UTF-8?q?t=5Fhandler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ifstat_kern.c | 4 ++-- ifstatd.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ifstat_kern.c b/ifstat_kern.c index c363a31..4e093b9 100644 --- a/ifstat_kern.c +++ b/ifstat_kern.c @@ -238,14 +238,14 @@ static inline void parse_ipv4(void *packet, void *packet_end) { #endif } -int packet_handler(struct xdp_md *ctx) { +int xdp_packet_handler(struct xdp_md *ctx) { // HACK: К сожалению, нельзя, чтобы bpf_trace_printk использовался в // макросах, из-за чего нет возможности избавиться от дублирования // проверки #ifdef DEBUG ... #endif везде // __FUNCTION__ тоже нельзя использовать :( #ifdef DEBUG - bpf_trace_printk("packet_handler called!\n"); + bpf_trace_printk("xdp_packet_handler called!\n"); #endif void* packet_end = (void*)(long)ctx->data_end; diff --git a/ifstatd.lua b/ifstatd.lua index c9dab40..d899ac5 100755 --- a/ifstatd.lua +++ b/ifstatd.lua @@ -105,7 +105,7 @@ local inject_ifstat_bpf = function(BPF, iface, filters) local cflags = defines_to_cflags(defines) local bpf = BPF:new{src_file="ifstat_kern.c", debug=0, cflags=cflags} - bpf:attach_xdp{device=iface, fn_name="packet_handler"} + bpf:attach_xdp{device=iface, fn_name="xdp_packet_handler"} return bpf end -- cgit v1.1