diff options
author | Daniel Borkmann <dborkman@redhat.com> | 2013-03-16 14:25:20 +0100 |
---|---|---|
committer | Daniel Borkmann <dborkman@redhat.com> | 2013-03-16 14:25:20 +0100 |
commit | d040e1715d0afb74a474bcf1552e250cbceb8966 (patch) | |
tree | add26ad6639c1a89cc32c67fe92c86ba31521e69 /trafgen.c | |
parent | 79a5df56848ccacf1ab0202e969a8a5206ecaafe (diff) |
netsniff-ng trafgen: check return value of pull_and_flush_ring
Let us check the return value when the timer triggers a TX flush
request to the kernel. However, ignore the case of BADFS and NOBUFS.
The socket could already have been closed before the timer triggers
in the first case, and in the second, we just let the next timer
continue processing if currently the buffer space is exhausted.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'trafgen.c')
-rw-r--r-- | trafgen.c | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -127,8 +127,19 @@ static void signal_handler(int number) static void timer_elapsed(int number) { + int ret; + set_itimer_interval_value(&itimer, 0, interval); - pull_and_flush_tx_ring(sock); + + ret = pull_and_flush_tx_ring(sock); + if (unlikely(ret < 0)) { + /* We could hit EBADF if the socket has been closed before + * the timer was triggered. + */ + if (errno != EBADF && errno != ENOBUFS) + panic("Flushing TX_RING failed: %s!\n", strerror(errno)); + } + setitimer(ITIMER_REAL, &itimer, NULL); } |