diff --git a/platform/win32/contiki-conf.h b/platform/win32/contiki-conf.h
index 1ad883c4c..37ed2f6c3 100644
--- a/platform/win32/contiki-conf.h
+++ b/platform/win32/contiki-conf.h
@@ -24,7 +24,6 @@
#define LOG_CONF_ENABLED 1
#include "sys/log.h"
CCIF void debug_printf(char *format, ...);
-CCIF void error_exit(char *message);
@@ -119,7 +118,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_MAX_CONNECTIONS 40
#define UIP_CONF_MAX_LISTENPORTS 40
#define UIP_CONF_BUFFER_SIZE 420
-#define UIP_CONF_BYTE_ORDER LITTLE_ENDIAN
+#define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN
#define UIP_CONF_TCP_SPLIT 1
#define UIP_CONF_LOGGING 1
#define UIP_CONF_UDP_CHECKSUMS 1
diff --git a/platform/win32/contiki-main.c b/platform/win32/contiki-main.c
index 6aa180798..10a4cf29b 100644
--- a/platform/win32/contiki-main.c
+++ b/platform/win32/contiki-main.c
@@ -30,7 +30,7 @@
*
* Author: Oliver Schmidt
*
- * $Id: contiki-main.c,v 1.5 2007/04/09 11:57:15 oliverschmidt Exp $
+ * $Id: contiki-main.c,v 1.6 2007/04/11 00:17:25 oliverschmidt Exp $
*/
#define WIN32_LEAN_AND_MEAN
@@ -58,7 +58,7 @@ PROCINIT(&etimer_process,
&cfs_win32_process,
&ctk_conio_service_process,
&ctk_process,
- &wpcap_service_process,
+ &wpcap_process,
&tcpip_process,
&resolv_process,
&program_handler_process);
@@ -89,16 +89,6 @@ log_message(const char *part1, const char *part2)
debug_printf("%s%s\n", part1, part2);
}
/*-----------------------------------------------------------------------------------*/
-void
-error_exit(char *message)
-{
- debug_printf("Error Exit: %s", message);
-
- console_exit();
- console_cputs(message);
- exit(EXIT_FAILURE);
-}
-/*-----------------------------------------------------------------------------------*/
clock_time_t
clock_time(void)
{
diff --git a/platform/win32/net/wpcap-service.c b/platform/win32/net/wpcap-service.c
deleted file mode 100644
index 90165a265..000000000
--- a/platform/win32/net/wpcap-service.c
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright (c) 2006, Swedish Institute of Computer Science.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Institute nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * This file is part of the Contiki operating system.
- *
- * Author: Oliver Schmidt
- *
- * $Id: wpcap-service.c,v 1.8 2007/04/08 20:09:11 oliverschmidt Exp $
- */
-
-#define WIN32_LEAN_AND_MEAN
-#include
-#include
-#include
-#include
-#include
-
-#pragma comment(lib, "ws2_32")
-#pragma comment(lib, "iphlpapi")
-
-/* Avoid 'redefinition' error. */
-#define htonl
-#define htons
-
-#include "contiki.h"
-#include "contiki-net.h"
-
-void send_packet(void);
-
-SERVICE(wpcap_service, packet_service, { (u8_t (*)(void))send_packet });
-
-PROCESS(wpcap_service_process, "WinPcap driver");
-
-struct pcap;
-
-struct pcap_if {
- struct pcap_if *next;
- char *name;
- char *description;
- struct pcap_addr {
- struct pcap_addr *next;
- struct sockaddr *addr;
- struct sockaddr *netmask;
- struct sockaddr *broadaddr;
- struct sockaddr *dstaddr;
- } *addresses;
- unsigned __int32 flags;
-};
-
-struct pcap_pkthdr {
- struct timeval ts;
- unsigned __int32 caplen;
- unsigned __int32 len;
-};
-
-static struct pcap *pcap;
-
-static int (* pcap_findalldevs)(struct pcap_if **, char *);
-static struct pcap *(* pcap_open_live)(char *, int, int, int, char *);
-static int (* pcap_next_ex)(struct pcap *, struct pcap_pkthdr **, unsigned char **);
-static int (* pcap_sendpacket)(struct pcap *, unsigned char *, int);
-
-#define BUF ((struct uip_eth_hdr *)&uip_buf[0])
-
-/*---------------------------------------------------------------------------*/
-static void
-pollhandler(void)
-{
- struct pcap_pkthdr *packet_header;
- unsigned char *packet;
-
- process_poll(&wpcap_service_process);
-
- switch(pcap_next_ex(pcap, &packet_header, &packet)) {
- case -1:
- error_exit("Error on poll\n");
- case 0:
- return;
- }
-
- if(packet_header->caplen > UIP_BUFSIZE) {
- return;
- }
-
- uip_len = packet_header->caplen;
- CopyMemory(uip_buf, packet, uip_len);
-
- if(BUF->type == HTONS(UIP_ETHTYPE_IP)) {
- tcpip_input();
-
- } else if(BUF->type == HTONS(UIP_ETHTYPE_ARP)) {
- uip_arp_arpin();
-
- if(uip_len > 0) {
- if(pcap_sendpacket(pcap, uip_buf, uip_len) == -1) {
- error_exit("Error on ARP response\n");
- }
- }
- }
-}
-/*---------------------------------------------------------------------------*/
-static void
-send_packet(void)
-{
- uip_arp_out();
-
- if(pcap_sendpacket(pcap, uip_buf, uip_len) == -1) {
- error_exit("Error on send\n");
- }
-}
-/*---------------------------------------------------------------------------*/
-static void
-init_pcap(struct in_addr addr)
-{
- struct pcap_if *interfaces;
- char error[256];
-
- if(pcap_findalldevs(&interfaces, error) == -1) {
- error_exit(error);
- }
-
- while(interfaces != NULL) {
- debug_printf("Found interface: %s\n", interfaces->description);
-
- if(interfaces->addresses != NULL &&
- interfaces->addresses->addr != NULL &&
- interfaces->addresses->addr->sa_family == AF_INET) {
-
- struct in_addr interface_addr;
- interface_addr = ((struct sockaddr_in *)interfaces->addresses->addr)->sin_addr;
- debug_printf(" With address: %s\n", inet_ntoa(interface_addr));
-
- if(interface_addr.s_addr == addr.s_addr) {
- break;
- }
- }
- interfaces = interfaces->next;
- }
-
- if(interfaces == NULL) {
- error_exit("No interface found with IP addr specified on cmdline\n");
- }
-
- pcap = pcap_open_live(interfaces->name, UIP_BUFSIZE, 0, -1, error);
- if(pcap == NULL) {
- error_exit(error);
- }
-}
-/*---------------------------------------------------------------------------*/
-static void
-set_ethaddr(struct in_addr addr)
-{
- PIP_ADAPTER_ADDRESSES adapters;
- ULONG size = 0;
-
- if(GetAdaptersAddresses(AF_INET, GAA_FLAG_SKIP_ANYCAST |
- GAA_FLAG_SKIP_MULTICAST |
- GAA_FLAG_SKIP_DNS_SERVER,
- NULL, NULL, &size) != ERROR_BUFFER_OVERFLOW) {
- error_exit("Error on access to adapter list size\n");
- }
- adapters = alloca(size);
- if(GetAdaptersAddresses(AF_INET, GAA_FLAG_SKIP_ANYCAST |
- GAA_FLAG_SKIP_MULTICAST |
- GAA_FLAG_SKIP_DNS_SERVER,
- NULL, adapters, &size) != ERROR_SUCCESS) {
- error_exit("Error on access to adapter list\n");
- }
-
- while(adapters != NULL) {
-
- char description[256];
- WideCharToMultiByte(CP_ACP, 0, adapters->Description, -1,
- description, sizeof(description), NULL, NULL);
- debug_printf("Found adapter: %s\n", description);
-
- if(adapters->FirstUnicastAddress != NULL &&
- adapters->FirstUnicastAddress->Address.lpSockaddr != NULL &&
- adapters->FirstUnicastAddress->Address.lpSockaddr->sa_family == AF_INET) {
-
- struct in_addr adapter_addr;
- adapter_addr = ((struct sockaddr_in *)adapters->FirstUnicastAddress->Address.lpSockaddr)->sin_addr;
- debug_printf(" With address: %s\n", inet_ntoa(adapter_addr));
-
- if(adapter_addr.s_addr == addr.s_addr) {
- if(adapters->PhysicalAddressLength != 6) {
- error_exit("IP addr specified on cmdline does not belong to an Ethernet card\n");
- }
- debug_printf(" Ethernetaddr: %02X-%02X-%02X-%02X-%02X-%02X\n",
- adapters->PhysicalAddress[0],
- adapters->PhysicalAddress[1],
- adapters->PhysicalAddress[2],
- adapters->PhysicalAddress[3],
- adapters->PhysicalAddress[4],
- adapters->PhysicalAddress[5]);
-
- uip_setethaddr((*(struct uip_eth_addr *)adapters->PhysicalAddress));
- break;
- }
- }
- adapters = adapters->Next;
- }
-
- if(adapters == NULL) {
- error_exit("No adapter found with IP addr specified on cmdline\n");
- }
-}
-/*---------------------------------------------------------------------------*/
-PROCESS_THREAD(wpcap_service_process, ev, data)
-{
- static struct in_addr addr;
- static HMODULE wpcap;
-
- PROCESS_POLLHANDLER(pollhandler());
-
- PROCESS_BEGIN();
-
- addr.s_addr = inet_addr(__argv[1]);
- if(addr.s_addr == INADDR_NONE) {
- error_exit("Usage: contiki \n");
- }
- debug_printf("Cmdline address: %s\n", inet_ntoa(addr));
-
- wpcap = LoadLibrary("wpcap.dll");
- (FARPROC)pcap_findalldevs = GetProcAddress(wpcap, "pcap_findalldevs");
- (FARPROC)pcap_open_live = GetProcAddress(wpcap, "pcap_open_live");
- (FARPROC)pcap_next_ex = GetProcAddress(wpcap, "pcap_next_ex");
- (FARPROC)pcap_sendpacket = GetProcAddress(wpcap, "pcap_sendpacket");
-
- if(pcap_findalldevs == NULL || pcap_open_live == NULL ||
- pcap_next_ex == NULL || pcap_sendpacket == NULL) {
- error_exit("Error on access to WinPcap library\n");
- }
-
- init_pcap(addr);
- set_ethaddr(addr);
-
- uip_arp_init();
-
- SERVICE_REGISTER(wpcap_service);
-
- process_poll(&wpcap_service_process);
-
- PROCESS_WAIT_EVENT_UNTIL(ev == PROCESS_EVENT_EXIT ||
- ev == PROCESS_EVENT_SERVICE_REMOVED);
-
- SERVICE_REMOVE(wpcap_service);
-
- FreeLibrary(wpcap);
-
- PROCESS_END();
-}
-/*---------------------------------------------------------------------------*/
diff --git a/platform/win32/net/wpcap-service.h b/platform/win32/net/wpcap-service.h
deleted file mode 100644
index db7178305..000000000
--- a/platform/win32/net/wpcap-service.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2006, Swedish Institute of Computer Science.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Institute nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * This file is part of the Contiki operating system.
- *
- * Author: Oliver Schmidt
- *
- * $Id: wpcap-service.h,v 1.1 2006/09/23 20:25:03 oliverschmidt Exp $
- */
-
-#ifndef __WPCAP_SERVICE_H__
-#define __WPCAP_SERVICE_H__
-
-#include "contiki.h"
-
-PROCESS_NAME(wpcap_service_process);
-
-#endif /* __WPCAP_SERVICE_H__ */