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

Increased default packet size to 64, removed out-commented code

Browse source
This commit is contained in:
adamdunkels 2007-03-28 19:52:27 +00:00
parent 75dc71f70b
commit 8e0ae73fa5
1 changed files with 13 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
core/net/rime/rudolph1.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: rudolph1.c,v 1.3 2007/03/26 22:45:50 oliverschmidt Exp $ * $Id: rudolph1.c,v 1.4 2007/03/28 19:52:27 adamdunkels Exp $
*/ */
/** /**
@ -55,7 +55,7 @@ struct rudolph1_hdr {
u16_t chunk; u16_t chunk;
}; };
#define RUDOLPH1_DATASIZE 32 #define RUDOLPH1_DATASIZE 64
struct rudolph1_datapacket { struct rudolph1_datapacket {
struct rudolph1_hdr h; struct rudolph1_hdr h;
@ -88,9 +88,6 @@ read_data(struct rudolph1_conn *c, char *dataptr, int chunk)
len = c->cb->read_chunk(c, chunk * RUDOLPH1_DATASIZE, len = c->cb->read_chunk(c, chunk * RUDOLPH1_DATASIZE,
dataptr, RUDOLPH1_DATASIZE); dataptr, RUDOLPH1_DATASIZE);
} }
/* cfs_seek(c->cfs_fd, chunk * RUDOLPH1_DATASIZE);
len = cfs_read(c->cfs_fd, dataptr, RUDOLPH1_DATASIZE);*/
return len; return len;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -118,13 +115,9 @@ write_data(struct rudolph1_conn *c, int chunk, u8_t *data, int datalen)
c->cb->write_chunk(c, 0, RUDOLPH1_FLAG_NEWFILE, data, 0); c->cb->write_chunk(c, 0, RUDOLPH1_FLAG_NEWFILE, data, 0);
} }
/* cfs_seek(c->cfs_fd, chunk * RUDOLPH1_DATASIZE);
cfs_write(c->cfs_fd, data, datalen);*/
if(datalen < RUDOLPH1_DATASIZE) { if(datalen < RUDOLPH1_DATASIZE) {
PRINTF("%d: get %d bytes, file complete\n", PRINTF("%d: get %d bytes, file complete\n",
rimeaddr_node_addr.u16, datalen); rimeaddr_node_addr.u16, datalen);
/* c->cb->received_file(c, c->cfs_fd);*/
c->cb->write_chunk(c, chunk * RUDOLPH1_DATASIZE, c->cb->write_chunk(c, chunk * RUDOLPH1_DATASIZE,
RUDOLPH1_FLAG_LASTCHUNK, data, datalen); RUDOLPH1_FLAG_LASTCHUNK, data, datalen);
} else { } else {
@ -154,10 +147,8 @@ handle_data(struct rudolph1_conn *c, struct rudolph1_datapacket *p)
{ {
if(LT(c->version, p->h.version)) { if(LT(c->version, p->h.version)) {
PRINTF("rudolph1 new version %d\n", p->h.version); PRINTF("rudolph1 new version %d\n", p->h.version);
/* c->cfs_fd = c->cb->new_file(c);*/
c->version = p->h.version; c->version = p->h.version;
c->chunk = 1; /* Next chunk is 1. */ c->chunk = 1; /* Next chunk is 1. */
/* if(c->cfs_fd != -1) {*/
if(p->h.chunk != 0) { if(p->h.chunk != 0) {
send_nack(c); send_nack(c);
} else { } else {
@ -165,25 +156,17 @@ handle_data(struct rudolph1_conn *c, struct rudolph1_datapacket *p)
} }
/* }*/ /* }*/
} else if(p->h.version == c->version) { } else if(p->h.version == c->version) {
/* if(c->cfs_fd != -1) {*/ if(p->h.chunk == c->chunk) {
if(p->h.chunk == c->chunk) { PRINTF("%d: received chunk %d\n",
PRINTF("%d: received chunk %d\n", rimeaddr_node_addr.u16, p->h.chunk);
rimeaddr_node_addr.u16, p->h.chunk); write_data(c, p->h.chunk, p->data, p->datalen);
write_data(c, p->h.chunk, p->data, p->datalen); c->chunk++;
c->chunk++; } else if(p->h.chunk > c->chunk) {
/* cfs_seek(c->cfs_fd, c->chunk * RUDOLPH1_DATASIZE); PRINTF("%d: received chunk %d > %d, sending NACK\n",
cfs_write(c->cfs_fd, p->data, p->datalen); rimeaddr_node_addr.u16,
c->chunk++; p->h.chunk, c->chunk);
if(p->datalen < RUDOLPH1_DATASIZE) { send_nack(c);
c->cb->received_file(c, c->cfs_fd); }
}*/
} else if(p->h.chunk > c->chunk) {
PRINTF("%d: received chunk %d > %d, sending NACK\n",
rimeaddr_node_addr.u16,
p->h.chunk, c->chunk);
send_nack(c);
}
/* } */
} else { /* p->h.version < c->current.h.version */ } else { /* p->h.version < c->current.h.version */
/* Ignore packets with old version */ /* Ignore packets with old version */
} }
@ -196,10 +179,6 @@ recv_trickle(struct trickle_conn *trickle)
struct rudolph1_conn *c = (struct rudolph1_conn *)trickle; struct rudolph1_conn *c = (struct rudolph1_conn *)trickle;
struct rudolph1_datapacket *p = rimebuf_dataptr(); struct rudolph1_datapacket *p = rimebuf_dataptr();
/* if(rand() & 1) {
return;
}*/
if(p->h.type == TYPE_DATA) { if(p->h.type == TYPE_DATA) {
handle_data(c, p); handle_data(c, p);
} }
@ -212,10 +191,6 @@ recv_uabc(struct uabc_conn *uabc)
((char *)uabc - offsetof(struct rudolph1_conn, uabc)); ((char *)uabc - offsetof(struct rudolph1_conn, uabc));
struct rudolph1_datapacket *p = rimebuf_dataptr(); struct rudolph1_datapacket *p = rimebuf_dataptr();
/* if(rand() & 1) {
return;
}*/
c->nacks++; c->nacks++;
if(p->h.type == TYPE_NACK) { if(p->h.type == TYPE_NACK) {
@ -274,7 +249,6 @@ rudolph1_close(struct rudolph1_conn *c)
void void
rudolph1_send(struct rudolph1_conn *c) rudolph1_send(struct rudolph1_conn *c)
{ {
/* c->cfs_fd = cfs_fd;*/
c->version++; c->version++;
c->chunk = 0; c->chunk = 0;
c->trickle_interval = TRICKLE_INTERVAL; c->trickle_interval = TRICKLE_INTERVAL;
@ -286,8 +260,6 @@ rudolph1_send(struct rudolph1_conn *c)
void void
rudolph1_stop(struct rudolph1_conn *c) rudolph1_stop(struct rudolph1_conn *c)
{ {
/* XXX */
ctimer_stop(&c->t); ctimer_stop(&c->t);
printf("rudolph1_stop: not implemented\n");
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/