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

Improved error handling.

Browse source
This commit is contained in:
oliverschmidt 2006-10-03 00:28:36 +00:00
parent a043ca000b
commit d62f9608dc
1 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
platform/win32/net/wpcap-service.c
View file

@ -30,13 +30,14 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $Id: wpcap-service.c,v 1.1 2006/09/23 20:25:03 oliverschmidt Exp $ * $Id: wpcap-service.c,v 1.2 2006/10/03 00:28:36 oliverschmidt Exp $
*/ */
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <winsock2.h> #include <winsock2.h>
#include <stdlib.h> #include <stdlib.h>
#include <process.h>
#pragma comment(lib, "wsock32") #pragma comment(lib, "wsock32")
@ -81,6 +82,15 @@ static int (* pcap_sendpacket)(struct pcap *, unsigned char *, int);
#define BUF ((struct uip_eth_hdr *)&uip_buf[0]) #define BUF ((struct uip_eth_hdr *)&uip_buf[0])
/*---------------------------------------------------------------------------*/
static void
error_exit(char *message)
{
debug_printf("Error Exit: %s", message);
_cexit();
console_cputs(message);
ExitProcess(EXIT_FAILURE);
}
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
pollhandler(void) pollhandler(void)
@ -92,7 +102,7 @@ pollhandler(void)
switch(pcap_next_ex(pcap, &packet_header, &packet)) { switch(pcap_next_ex(pcap, &packet_header, &packet)) {
case -1: case -1:
exit(1); error_exit("Error on poll\n");
case 0: case 0:
return; return;
} }
@ -101,12 +111,15 @@ pollhandler(void)
CopyMemory(uip_buf, packet, uip_len); CopyMemory(uip_buf, packet, uip_len);
if(BUF->type == HTONS(UIP_ETHTYPE_IP)) { if(BUF->type == HTONS(UIP_ETHTYPE_IP)) {
debug_printf("I");
uip_len -= sizeof(struct uip_eth_hdr);
tcpip_input(); tcpip_input();
} else if(BUF->type == HTONS(UIP_ETHTYPE_ARP)) { } else if(BUF->type == HTONS(UIP_ETHTYPE_ARP)) {
debug_printf("A");
uip_arp_arpin(); uip_arp_arpin();
if(uip_len > 0) { if(uip_len > 0) {
if(pcap_sendpacket(pcap, uip_buf, uip_len) == -1) { if(pcap_sendpacket(pcap, uip_buf, uip_len) == -1) {
exit(1); error_exit("Error on ARP response\n");
} }
} }
} }
@ -118,7 +131,7 @@ send_packet(void)
uip_arp_out(); uip_arp_out();
if(pcap_sendpacket(pcap, uip_buf, uip_len) == -1) { if(pcap_sendpacket(pcap, uip_buf, uip_len) == -1) {
exit(1); error_exit("Error on send\n");
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -138,7 +151,7 @@ PROCESS_THREAD(wpcap_service_process, ev, data)
if(pcap_findalldevs == NULL || pcap_open_live == NULL || if(pcap_findalldevs == NULL || pcap_open_live == NULL ||
pcap_next_ex == NULL || pcap_sendpacket == NULL) { pcap_next_ex == NULL || pcap_sendpacket == NULL) {
exit(1); error_exit("Error on access to WinPcap library\n");
} }
{ {
@ -148,12 +161,12 @@ PROCESS_THREAD(wpcap_service_process, ev, data)
cmdline_addr.s_addr = inet_addr(__argv[1]); cmdline_addr.s_addr = inet_addr(__argv[1]);
if(cmdline_addr.s_addr == INADDR_NONE) { if(cmdline_addr.s_addr == INADDR_NONE) {
exit(1); error_exit("Usage: contiki <IP addr of Ethernet card to share>\n");
} }
debug_printf("Cmdline address: %s\n", inet_ntoa(cmdline_addr)); debug_printf("Cmdline address: %s\n", inet_ntoa(cmdline_addr));
if(pcap_findalldevs(&interfaces, error) == -1) { if(pcap_findalldevs(&interfaces, error) == -1) {
exit(1); error_exit(error);
} }
while(interfaces != NULL) { while(interfaces != NULL) {
@ -172,12 +185,12 @@ PROCESS_THREAD(wpcap_service_process, ev, data)
} }
if(interfaces == NULL) { if(interfaces == NULL) {
exit(1); error_exit("No Ethernet card found with IP addr specified on cmdline\n");
} }
pcap = pcap_open_live(interfaces->name, UIP_BUFSIZE, 0, -1, error); pcap = pcap_open_live(interfaces->name, UIP_BUFSIZE, 0, -1, error);
if(pcap == NULL) { if(pcap == NULL) {
exit(1); error_exit(error);
} }
} }