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

Patch from Roger Larsson to answer mac address request, for testing autoconfigure.

Browse source
This commit is contained in:
dak664 2010-12-23 22:38:47 +00:00
parent 90a6d768ea
commit 8b5577eca2
1 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
core/dev/slip.c
View file

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: slip.c,v 1.11 2010/10/19 18:29:04 adamdunkels Exp $ * @(#)$Id: slip.c,v 1.12 2010/12/23 22:38:47 dak664 Exp $
*/ */
@ -94,6 +94,10 @@ slip_set_input_callback(void (*c)(void))
input_callback = c; input_callback = c;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* slip_send: forward (IPv4) packets with {UIP_FW_NETIF(..., slip_send)}
* was used in slip-bridge.c
*/
//#if WITH_UIP
u8_t u8_t
slip_send(void) slip_send(void)
{ {
@ -122,6 +126,7 @@ slip_send(void)
return UIP_FW_OK; return UIP_FW_OK;
} }
//#endif /* WITH_UIP */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
u8_t u8_t
slip_write(const void *_ptr, int len) slip_write(const void *_ptr, int len)
@ -175,6 +180,32 @@ slip_poll_handler(u8_t *outbuf, u16_t blen)
return 0; return 0;
} }
} }
#ifdef SLIP_CONF_ANSWER_MAC_REQUEST
else if(rxbuf[begin] == '?') {
/* Used by tapslip6 to request mac for auto configure */
int i, j;
char* hexchar = "0123456789abcdef";
if(begin < end && (end - begin) >= 2
&& rxbuf[begin + 1] == 'M') {
state = STATE_TWOPACKETS; /* Interrupts do nothing. */
rxbuf[begin] = 0;
rxbuf[begin + 1] = 0;
rxbuf_init();
rimeaddr_t addr = get_mac_addr();
/* this is just a test so far... just to see if it works */
slip_arch_writeb('!');
slip_arch_writeb('M');
for(j = 0; j < 8; j++) {
slip_arch_writeb(hexchar[addr.u8[j] >> 4]);
slip_arch_writeb(hexchar[addr.u8[j] & 15]);
}
slip_arch_writeb(SLIP_END);
return 0;
}
}
#endif /* SLIP_CONF_ANSWER_MAC_REQUEST */
/* /*
* Interrupt can not change begin but may change pkt_end. * Interrupt can not change begin but may change pkt_end.
@ -259,7 +290,11 @@ PROCESS_THREAD(slip_process, ev, data)
BUF->ipchksum++; BUF->ipchksum++;
} }
} }
#ifdef SLIP_CONF_TCPIP_INPUT
SLIP_CONF_TCPIP_INPUT();
#else
tcpip_input(); tcpip_input();
#endif
} else { } else {
uip_len = 0; uip_len = 0;
SLIP_STATISTICS(slip_ip_drop++); SLIP_STATISTICS(slip_ip_drop++);
@ -269,7 +304,11 @@ PROCESS_THREAD(slip_process, ev, data)
if(input_callback) { if(input_callback) {
input_callback(); input_callback();
} }
#ifdef SLIP_CONF_TCPIP_INPUT
SLIP_CONF_TCPIP_INPUT();
#else
tcpip_input(); tcpip_input();
#endif
} }
#endif /* UIP_CONF_IPV6 */ #endif /* UIP_CONF_IPV6 */
} }