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

Make wpcapslip compile with current uip headers

Browse source
This commit is contained in:
adamdunkels 2009-04-29 11:56:14 +00:00
parent 6fcca2d545
commit 3c68862599
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/wpcapslip/wpcap.c
View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $Id: wpcap.c,v 1.3 2008/06/19 07:52:28 adamdunkels Exp $ * $Id: wpcap.c,v 1.4 2009/04/29 11:56:14 adamdunkels Exp $
*/ */
@ -544,13 +544,17 @@ wpcap_start(char *ethcardaddr, char *slipnetaddr, char *slipnetmask, int log)
{ {
struct in_addr addr; struct in_addr addr;
char buf[4000]; char buf[4000];
uint32_t tmpaddr;
logging = log; logging = log;
addr.s_addr = inet_addr(ethcardaddr); addr.s_addr = inet_addr(ethcardaddr);
ifaddr.u32[0] = inet_addr(ethcardaddr); tmpaddr = inet_addr(ethcardaddr);
netaddr.u32[0] = inet_addr(slipnetaddr); memcpy(&ifaddr.u16[0], &tmpaddr, sizeof(tmpaddr));
netmask.u32[0] = inet_addr(slipnetmask); tmpaddr = inet_addr(slipnetaddr);
memcpy(&netaddr.u16[0], &tmpaddr, sizeof(tmpaddr));
tmpaddr = inet_addr(slipnetmask);
memcpy(&netmask.u16[0], &tmpaddr, sizeof(tmpaddr));
printf("Network address %d.%d.%d.%d/%d.%d.%d.%d\n", printf("Network address %d.%d.%d.%d/%d.%d.%d.%d\n",
uip_ipaddr_to_quad(&netaddr), uip_ipaddr_to_quad(&netaddr),