deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rewrote the sniffer code to use a list, which makes it possible to add any number of sniffers. Sniffers now can be both for incoming and outoing packets.

Browse source
This commit is contained in:
adamdunkels 2008-01-14 09:42:00 +00:00
parent 7a356d0fb5
commit 042180c13f
1 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
core/net/rime/rime.c
View file

@ -33,7 +33,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: rime.c,v 1.14 2008/01/08 07:53:02 adamdunkels Exp $ * $Id: rime.c,v 1.15 2008/01/14 09:42:00 adamdunkels Exp $
*/ */
/** /**
@ -48,25 +48,36 @@
#include "net/rime/route.h" #include "net/rime/route.h"
#include "net/mac/mac.h" #include "net/mac/mac.h"
#include "lib/list.h"
const struct mac_driver *rime_mac; const struct mac_driver *rime_mac;
static void (*sniffer_callback)(void); LIST(sniffers);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
rime_set_sniffer(void (* sniffer)(void)) rime_sniffer_add(struct rime_sniffer *s)
{ {
sniffer_callback = sniffer; list_add(sniffers, s);
}
/*---------------------------------------------------------------------------*/
void
rime_sniffer_remove(struct rime_sniffer *s)
{
list_remove(sniffers, s);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
input(const struct mac_driver *r) input(const struct mac_driver *r)
{ {
int len; int len;
struct rime_sniffer *s;
len = rime_mac->read(); len = rime_mac->read();
if(len > 0) { if(len > 0) {
if(sniffer_callback != NULL) { for(s = list_head(sniffers); s != NULL; s = s->next) {
sniffer_callback(); if(s->input_callback != NULL) {
s->input_callback();
}
} }
RIMESTATS_ADD(rx); RIMESTATS_ADD(rx);
abc_input_packet(); abc_input_packet();
@ -87,8 +98,17 @@ rime_init(const struct mac_driver *m)
void void
rime_output(void) rime_output(void)
{ {
struct rime_sniffer *s;
RIMESTATS_ADD(tx); RIMESTATS_ADD(tx);
rimebuf_compact(); rimebuf_compact();
for(s = list_head(sniffers); s != NULL; s = s->next) {
if(s->output_callback != NULL) {
s->output_callback();
}
}
if(rime_mac) { if(rime_mac) {
rime_mac->send(); rime_mac->send();
} }