giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed Rime nf module to netflood

Browse Source
This commit is contained in:
adamdunkels 2008-07-03 22:25:22 +00:00
parent ec22f3c2fc
commit d9b3097037
2 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
core/net/rime/nf.c → core/net/rime/netflood.c
View File

@ -1,5 +1,5 @@
/**
* \addtogroup rimenf
* \addtogroup rimenetflood
* @{
*/
@ -33,23 +33,23 @@
*
* This file is part of the Contiki operating system.
*
* $Id: nf.c,v 1.16 2008/02/24 22:05:27 adamdunkels Exp $
* $Id: netflood.c,v 1.1 2008/07/03 22:25:22 adamdunkels Exp $
*/
/**
* \file
* Best-effort network flooding (nf)
* Best-effort network flooding (netflood)
* \author
* Adam Dunkels <adam@sics.se>
*/
#include "net/rime/nf.h"
#include "net/rime/netflood.h"
#include "lib/rand.h"
#include <string.h>
#define HOPS_MAX 16
struct nf_hdr {
struct netflood_hdr {
uint16_t originator_seqno;
rimeaddr_t originator;
uint16_t hops;
@ -65,9 +65,9 @@ struct nf_hdr {
/*---------------------------------------------------------------------------*/
static int
send(struct nf_conn *c)
send(struct netflood_conn *c)
{
PRINTF("%d.%d: nf send to ipolite\n",
PRINTF("%d.%d: netflood send to ipolite\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]);
return ipolite_send(&c->c, c->queue_time, 4);
}
@ -75,8 +75,8 @@ send(struct nf_conn *c)
static void
recv_from_ipolite(struct ipolite_conn *ipolite, rimeaddr_t *from)
{
struct nf_conn *c = (struct nf_conn *)ipolite;
struct nf_hdr *hdr = rimebuf_dataptr();
struct netflood_conn *c = (struct netflood_conn *)ipolite;
struct netflood_hdr *hdr = rimebuf_dataptr();
uint8_t hops;
struct queuebuf *queuebuf;
@ -85,7 +85,7 @@ recv_from_ipolite(struct ipolite_conn *ipolite, rimeaddr_t *from)
/* Remember packet if we need to forward it. */
queuebuf = queuebuf_new_from_rimebuf();
rimebuf_hdrreduce(sizeof(struct nf_hdr));
rimebuf_hdrreduce(sizeof(struct netflood_hdr));
if(c->u->recv != NULL) {
if(!(rimeaddr_cmp(&hdr->originator, &c->last_originator) &&
hdr->originator_seqno <= c->last_originator_seqno)) {
@ -101,7 +101,7 @@ recv_from_ipolite(struct ipolite_conn *ipolite, rimeaddr_t *from)
/* Rebroadcast received packet. */
if(hops < HOPS_MAX) {
PRINTF("%d.%d: nf rebroadcasting %d.%d/%d (%d.%d/%d) hops %d\n",
PRINTF("%d.%d: netflood rebroadcasting %d.%d/%d (%d.%d/%d) hops %d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
hdr->originator.u8[0], hdr->originator.u8[1],
hdr->originator_seqno,
@ -125,7 +125,7 @@ recv_from_ipolite(struct ipolite_conn *ipolite, rimeaddr_t *from)
static void
sent(struct ipolite_conn *ipolite)
{
struct nf_conn *c = (struct nf_conn *)ipolite;
struct netflood_conn *c = (struct netflood_conn *)ipolite;
if(c->u->sent != NULL) {
c->u->sent(c);
}
@ -134,39 +134,39 @@ sent(struct ipolite_conn *ipolite)
static void
dropped(struct ipolite_conn *ipolite)
{
struct nf_conn *c = (struct nf_conn *)ipolite;
struct netflood_conn *c = (struct netflood_conn *)ipolite;
if(c->u->dropped != NULL) {
c->u->dropped(c);
}
}
/*---------------------------------------------------------------------------*/
static const struct ipolite_callbacks nf = {recv_from_ipolite, sent, dropped};
static const struct ipolite_callbacks netflood = {recv_from_ipolite, sent, dropped};
/*---------------------------------------------------------------------------*/
void
nf_open(struct nf_conn *c, clock_time_t queue_time,
uint16_t channel, const struct nf_callbacks *u)
netflood_open(struct netflood_conn *c, clock_time_t queue_time,
uint16_t channel, const struct netflood_callbacks *u)
{
ipolite_open(&c->c, channel, &nf);
ipolite_open(&c->c, channel, &netflood);
c->u = u;
c->queue_time = queue_time;
}
/*---------------------------------------------------------------------------*/
void
nf_close(struct nf_conn *c)
netflood_close(struct netflood_conn *c)
{
ipolite_close(&c->c);
}
/*---------------------------------------------------------------------------*/
int
nf_send(struct nf_conn *c, uint8_t seqno)
netflood_send(struct netflood_conn *c, uint8_t seqno)
{
if(rimebuf_hdralloc(sizeof(struct nf_hdr))) {
struct nf_hdr *hdr = rimebuf_hdrptr();
if(rimebuf_hdralloc(sizeof(struct netflood_hdr))) {
struct netflood_hdr *hdr = rimebuf_hdrptr();
rimeaddr_copy(&hdr->originator, &rimeaddr_node_addr);
rimeaddr_copy(&c->last_originator, &hdr->originator);
c->last_originator_seqno = hdr->originator_seqno = seqno;
hdr->hops = 0;
PRINTF("%d.%d: nf sending '%s'\n",
PRINTF("%d.%d: netflood sending '%s'\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
(char *)rimebuf_dataptr());
return ipolite_send(&c->c, 0, 4);
@ -175,7 +175,7 @@ nf_send(struct nf_conn *c, uint8_t seqno)
}
/*---------------------------------------------------------------------------*/
void
nf_cancel(struct nf_conn *c)
netflood_cancel(struct netflood_conn *c)
{
ipolite_cancel(&c->c);
}

36
core/net/rime/nf.h → core/net/rime/netflood.h
View File

@ -4,14 +4,14 @@
*/
/**
* \defgroup rimenf Best-effort network flooding
* \defgroup rimenetflood Best-effort network flooding
* @{
*
* The nf module does best-effort flooding.
* The netflood module does best-effort flooding.
*
* \section channels Channels
*
* The nf module uses 1 channel.
* The netflood module uses 1 channel.
*
*/
@ -45,46 +45,46 @@
*
* This file is part of the Contiki operating system.
*
* $Id: nf.h,v 1.11 2008/02/24 22:05:27 adamdunkels Exp $
* $Id: netflood.h,v 1.1 2008/07/03 22:25:22 adamdunkels Exp $
*/
/**
* \file
* Header file for the best-effort network flooding (nf)
* Header file for the best-effort network flooding (netflood)
* \author
* Adam Dunkels <adam@sics.se>
*/
#ifndef __NF_H__
#define __NF_H__
#ifndef __NETFLOOD_H__
#define __NETFLOOD_H__
#include "net/rime/ctimer.h"
#include "net/rime/queuebuf.h"
#include "net/rime/ipolite.h"
struct nf_conn;
struct netflood_conn;
struct nf_callbacks {
int (* recv)(struct nf_conn *c, rimeaddr_t *from,
struct netflood_callbacks {
int (* recv)(struct netflood_conn *c, rimeaddr_t *from,
rimeaddr_t *originator, uint8_t seqno, uint8_t hops);
void (* sent)(struct nf_conn *c);
void (* dropped)(struct nf_conn *c);
void (* sent)(struct netflood_conn *c);
void (* dropped)(struct netflood_conn *c);
};
struct nf_conn {
struct netflood_conn {
struct ipolite_conn c;
const struct nf_callbacks *u;
const struct netflood_callbacks *u;
clock_time_t queue_time;
rimeaddr_t last_originator;
uint8_t last_originator_seqno;
};
void nf_open(struct nf_conn *c, clock_time_t queue_time,
uint16_t channel, const struct nf_callbacks *u);
void nf_close(struct nf_conn *c);
void netflood_open(struct netflood_conn *c, clock_time_t queue_time,
uint16_t channel, const struct netflood_callbacks *u);
void netflood_close(struct netflood_conn *c);
int nf_send(struct nf_conn *c, uint8_t seqno);
int netflood_send(struct netflood_conn *c, uint8_t seqno);
#endif /* __SIBC_H__ */
/** @} */