Changeset 223

Timestamp:

02/15/10 17:12:05 (2 years ago)

Author:

marek

Message:

ap51-flash: flash without libpcap (linux only)

Location:

ap51-flash/trunk

Files:

• Makefile (modified) (3 diffs)
• ap51-flash.c (modified) (37 diffs)
• ap51-flash.h (modified) (6 diffs)
• main.c (modified) (2 diffs)
• missing-osx.h (modified) (2 diffs)
• packet.c (modified) (17 diffs)
• packet.h (modified) (2 diffs)
• socket.c (added)
• socket.h (copied) (copied from ap51-flash/trunk/packet.h) (1 diff)

ap51-flash/trunk/Makefile

@@ -22 +22 @@
 OBJCOPY = $(CROSS)objcopy
 WINDRES = $(CROSS)windres
-OFLAGS  = -Os -ggdb
+OFLAGS  = -Os
 CFLAGS  = -Wall -I. -IWpdPack/Include/ -fno-strict-aliasing -fpack-struct $(OFLAGS)
-LIB_OBJS= ap51-flash.o uip.o uip_arp.o timer.o clock-arch.o psock.o packet.o
+LIB_OBJS= ap51-flash.o uip.o uip_arp.o timer.o clock-arch.o psock.o packet.o socket.o
 OBJS    = $(LIB_OBJS) main.o
 AP51_RC = ap51-flash-res
 
 # enable debug output
-# CFLAGS += -DDEBUG
+# EXTRA_CFLAGS += -DDEBUG
 # enable packet debug output
-# CFLAGS += -DPACKET_DEBUG
+# EXTRA_CFLAGS += -DPACKET_DEBUG
 # enable flash from file mode
-# CFLAGS += -DFLASH_FROM_FILE
+# EXTRA_CFLAGS += -DFLASH_FROM_FILE
+# disable libpcap and use raw sockets instead (linux only!)
+# EXTRA_CFLAGS += -DNO_LIBPCAP
 
 # if you change the names here you also need to change the ap51-flash.c code
@@ -66 +68 @@
 endif
 
+# detect whether we should link against libpcap
+ifeq ($(PLATFORM),WIN32)
+LDFLAGS += -lwpcap
+else ifeq ($(PLATFORM),OSX)
+LDFLAGS += -lpcap
+else ifeq ($(PLATFORM),LINUX)
+ifeq ($(findstring NO_LIBPCAP,$(EXTRA_CFLAGS)),)
+LDFLAGS += -lpcap
+endif
+endif
+
 REVISION = $(shell if [ -d .svn ]; then \
                                 if which svn > /dev/null; then \
@@ -92 +105 @@
 
 ap51-flash: $(LIN_OBJS) $(OBJS) Makefile
-        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LIN_OBJS) $(OBJS) $(LDFLAGS) -lpcap -o $@
+        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LIN_OBJS) $(OBJS) $(LDFLAGS) -o $@
         $(STRIP) $@
 
 ap51-flash-static: $(LIN_OBJS) $(OBJS) libap51-flash.a Makefile
-        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LIN_OBJS) $(OBJS) $(LDFLAGS) -lpcap -static -o $@
+        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LIN_OBJS) $(OBJS) $(LDFLAGS) -static -o $@
         $(STRIP) $@
 
 ap51-flash.exe: $(WIN_OBJS) $(OBJS) Makefile
-        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -LWpdPack/Lib/ -DWIN32 -D_CONSOLE -D_MBCS $(WIN_OBJS) $(OBJS) $(LDFLAGS) -lwpcap -static -o $@
+        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -LWpdPack/Lib/ -DWIN32 -D_CONSOLE -D_MBCS $(WIN_OBJS) $(OBJS) $(LDFLAGS) -o $@
         $(STRIP) $@
 
 ap51-flash-osx: $(OSX_OBJ) $(OBJS) Makefile
-        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(OSX_OBJ) $(OBJS) $(LDFLAGS) -lpcap -o $@
+        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(OSX_OBJ) $(OBJS) $(LDFLAGS) -o $@
         $(STRIP) $@
 

ap51-flash/trunk/ap51-flash.c

@@ -22 +22 @@
 #include <string.h>
 
+#include "ap51-flash.h"
 #include "uip.h"
 #include "uip_arp.h"
 #include "timer.h"
-#include "ap51-flash.h"
 #include "device-info.h"
 #include "packet.h"
+#include "socket.h"
 
 unsigned char *kernel_buf = 0;
@@ -53 +54 @@
 static struct device_info *device_info = &flash_8mb_info;
 static char *kernelpartname = "vmlinux.bin.l7";
-pcap_t *pcap_fp = NULL;
 
 #if defined(EMBEDDED_DATA) && !defined(WIN32)
@@ -82 +82 @@
 }
 
-static int pcap_init(char *dev, uip_ipaddr_t* sip, uip_ipaddr_t* dip, struct uip_eth_addr* smac, struct uip_eth_addr* dmac, int special)
+static int ap51_init(char *dev, uip_ipaddr_t* sip, uip_ipaddr_t* dip, struct uip_eth_addr* smac, struct uip_eth_addr* dmac, int special)
 {
-        int arp_replies = 0, arp_grat_packets = 0;
-        char error[PCAP_ERRBUF_SIZE];
+        int ret, len, arp_replies = 0, arp_grat_packets = 0;
         const unsigned char *packet;
-        struct pcap_pkthdr hdr;
         struct ether_header *recv_ethhdr;
         struct ether_arp *recv_arphdr;
@@ -95 +93 @@
 
         /* Open the output adapter */
-        if (NULL == (pcap_fp = pcap_open_live(dev, 1500, 1, PCAP_TIMEOUT_MS, error))) {
-                fprintf(stderr, "Error opening adapter: %s\n", error);
-                return -1;
-        }
+        ret = socket_open(dev);
+        if (ret != 0)
+                return ret;
 
         arp_packet_init();
@@ -109 +106 @@
         *((unsigned int *)arphdr->arp_tpa) = htonl(ubnt_remote_ip);
 
+#if !defined(OSX)
+        // TODO: This is a seeming bug in OSX - won't work if we turn on non blocking - Lokkju
+        ret = socket_setnonblock();
+        if (ret != 0)
+                return ret;
+#endif
+
         fprintf(stderr, "Waiting for device to run auto-detection.\nMake sure, the device is connected directly!\n");
 
@@ -114 +118 @@
                 arp_packet_send();
 
-                while (NULL == (packet = pcap_next(pcap_fp, &hdr))) {
+                while (NULL == (packet = socket_read(&len))) {
 #if defined(DEBUG)
                         printf("No packet.\n");
@@ -131 +135 @@
                 }
 
-                if (hdr.len != 60) {
+                if (len != 60) {
 #if defined(DEBUG)
-                        fprintf(stderr, "Expect arp with length 60, received %d\n", hdr.len);
+                        fprintf(stderr, "Expect arp with length 60, received %d\n", len);
 #endif
                         continue;
@@ -201 +205 @@
         if (!special && 0 == P(*dip)[0] && 0 == P(*dip)[1] && 0 == P(*dip)[2] && 0 == P(*dip)[3]) {
                 fprintf(stderr, "Telnet for RedBoot not enabled.\n");
-                return -1;
+                return 1;
         }
 
@@ -220 +224 @@
 #endif
 
-#if !defined(OSX)
-        // TODO: This is a seeming bug in OSX - won't work if we turn on non blocking - Lokkju
-        if (0 > pcap_setnonblock(pcap_fp, 1, error)) {
-                fprintf(stderr,"Error setting non-blocking mode: %s\n", error);
-                return -1;
-        }
-#endif
         return 0;
 }
@@ -237 +234 @@
         if (!str_ptr) {
                 fprintf(stderr, "No RedBoot prompt detected. Exit in line %d\n", __LINE__);
-                return -1;
+                return 1;
         }
 
@@ -245 +242 @@
         if (!str_ptr) {
                 fprintf(stderr, "No RedBoot detected. Exit in line %d\n", __LINE__);
-                return -1;
+                return 1;
         }
 
@@ -253 +250 @@
                 fprintf(stderr, "No RedBoot prompt exceeds expected size (%i - expected %i). Exit in line %d\n",
                         (int)strlen(str_ptr), (int)sizeof(boot_prompt), __LINE__);
-                return -1;
+                return 1;
         }
 
@@ -276 +273 @@
                 PSOCK_READTO(345, &s->p, '>');
 
-                if (extract_boot_prompt(s) < 0)
+                if (extract_boot_prompt(s) != 0)
                         goto err_close;
 
@@ -316 +313 @@
                         fprintf(stderr, "rootfs(0x%08x) + kernel(0x%08x) + nvram(0x%08x) exceeds limit of 0x%08lx\n",
                                 rootfs_size, kernel_size, nvram_part_size, device_info->flash_size);
-                        exit(1);
+                        goto err_close;
                 }
 
@@ -362 +359 @@
                 if (tftp_bytes_sent < (unsigned long)rootfs_size) {
                         fprintf(stderr, "Error transferring rootfs, send=%ld, expected=%d\n", tftp_bytes_sent, rootfs_size);
-                        exit(1);
+                        goto err_close;
                 }
 
@@ -428 +425 @@
                 if (tftp_bytes_sent < (unsigned long)kernel_size) {
                         fprintf(stderr, "Error transferring kernel, send=%ld, expected=%d\n", tftp_bytes_sent, kernel_size);
-                        exit(1);
+                        goto err_close;
                 }
 
@@ -464 +461 @@
 
                 phase++;
-                break;
 
         } else if (phase == 6) {
@@ -480 +476 @@
                         if (!uncomp_loader)
                                 sprintf(str, "fis load %s %s\n",
-                                        (0x1f == fff_data[FFF_KERNEL].buff[0] && 0x8b ==fff_data[FFF_KERNEL].buff[1] ? "-d" : "-l"),
+                                        (fff_data[FFF_KERNEL].buff[0] == 0x1f && fff_data[FFF_KERNEL].buff[1] == 0x8b ? "-d" : "-l"),
                                         kernelpartname);
                         else
@@ -503 +499 @@
                 PSOCK_READTO(485, &s->p, '>');
                 phase++;
-                break;
 
         } else if (phase == 7) {
@@ -513 +508 @@
                 PSOCK_SEND_STR(495, &s->p, "reset\n");
                 printf("Done. Restarting device...\n");
-                exit(0);
                 phase++;
-                break;
+                return TCP_SUCCESS;
         }
 
         PSOCK_END(&s->p);
-        return 0;
+        return TCP_CONTINUE;
 
 err_close:
         PSOCK_CLOSE(&s->p);
         PSOCK_EXIT(&s->p);
-        exit(1);
+        return TCP_ERROR;
 }
 
@@ -534 +528 @@
                 PSOCK_INIT(&s->p, s->inputbuffer, sizeof(s->inputbuffer));
 
-        handle_connection(s);
+        tcp_status = handle_connection(s);
 }
 
@@ -544 +538 @@
 #endif
 
-        if (pcap_sendpacket(pcap_fp, uip_buf, uip_len) < 0) {
-                perror("pcap_sendpacket");
-                exit(1);
-        }
+        socket_write(uip_buf, uip_len);
 }
 
@@ -639 +630 @@
 
         close(*fd);
-        return 1;
+        return 0;
 
 err_free:
@@ -646 +637 @@
         close(*fd);
 err:
-        return -1;
+        return 1;
 }
 
-int ap51_flash(char *device, char *rootfs_filename, char *kernel_filename, int nvram, int uncomp, int special)
+int ap51_flash(char *iface, char *rootfs_filename, char *kernel_filename, int nvram, int uncomp, int special)
 {
         uip_ipaddr_t netmask;
         struct uip_eth_addr srcmac, dstmac, brcmac;
-        pcap_if_t *alldevs = NULL, *d;
-        char *pcap_device, errbuf[PCAP_ERRBUF_SIZE];
-        int ret, i, if_num = 0, ubnt_img = 0;
+        int ret, ubnt_img = 0, fd, size = 0;
         unsigned char *buf = 0;
-        int fd, size = 0;
-
-        pcap_device = device;
+        char *socket_dev;
+
         uip_init();
         uip_arp_init();
@@ -673 +661 @@
 
 #if defined(FLASH_FROM_FILE)
+        int i;
+
         if (flash_from_file) {
                 for (i = 0; i < FFF_NUM; i++) {
@@ -681 +671 @@
                                               &fff_data[i].file_size, &fff_data[i].flash_size, NULL);
 
-                        if (ret < 0)
-                                return 1;
+                        if (ret != 0)
+                                return ret;
 
                         printf("Reading %s file %s with %d bytes ...\n",
@@ -689 +679 @@
                 }
 
-                goto init_pcap;
+                goto init_socket;
         }
 #endif
@@ -697 +687 @@
                                       &size, &rootfs_size, &rootfs_buf);
 
-                if (ret < 0)
-                        return 1;
+                if (ret != 0)
+                        return ret;
 
                 printf("Reading rootfs file %s with %d bytes ...\n",
@@ -733 +723 @@
                                       &size, &kernel_size, &kernel_buf);
 
-                if (ret < 0)
-                        return 1;
+                if (ret != 0)
+                        return ret;
 
                 printf("Reading kernel file %s with %d bytes ...\n",
@@ -779 +769 @@
 
 #if defined(FLASH_FROM_FILE)
-init_pcap:
+init_socket:
 #endif
 
@@ -797 +787 @@
 
         /* if the user specified an interface number instead of the name */
-        if_num = strtol(device, NULL, 10);
-
-        if (pcap_findalldevs(&alldevs, errbuf) == -1)
-                alldevs = NULL;
-
-        /* Print the list */
-        i = 0;
-        for (d = alldevs; d != NULL; d = d->next) {
-                i++;
-
-                if (if_num == i) {
-                        pcap_device = d->name;
-                        break;
-                }
-        }
-
-        i = pcap_init(pcap_device, &srcipaddr, &dstipaddr, &srcmac, &dstmac, special);
-
-        if (alldevs)
-                pcap_freealldevs(alldevs);
-
-        if (i < 0)
-                return 1;
+        socket_dev = socket_find_dev_by_index(iface);
+
+        if (!socket_dev)
+                socket_dev = iface;
+
+        ret = ap51_init(socket_dev, &srcipaddr, &dstipaddr, &srcmac, &dstmac, special);
+
+        if (ret != 0)
+                return ret;
 
         uip_sethostaddr(srcipaddr);
@@ -835 +811 @@
                 flash_mode = MODE_REDBOOT;
 
+        ret = 1;
+
         switch (flash_mode) {
         case MODE_REDBOOT:
@@ -841 +819 @@
                             (!fff_data[FFF_KERNEL].fname)) {
                                 fprintf(stderr, "Error - redboot enabled device detected but rootfs & kernel file not available\n");
-                                return 1;
+                                goto sock_close;
                         }
                 } else {
                         if (ubnt_img) {
                                 fprintf(stderr, "Error - you are trying to flash a redboot device with a ubiquiti image!\n");
-                                return 1;
+                                goto sock_close;
                         }
                 }
@@ -856 +834 @@
                 if (NULL == uip_connect(&dstipaddr, htons(TELNET_PORT))) {
                         fprintf(stderr, "Error - cannot connect to port %i\n", TELNET_PORT);
-                        return 1;
+                        goto sock_close;
                 }
                 break;
@@ -886 +864 @@
                                 } else {
                                         perror("no mem");
-                                        return 1;
+                                        goto sock_close;
                                 }
                         }
@@ -896 +874 @@
                         if (!fff_data[FFF_UBNT].fname) {
                                 fprintf(stderr, "Error - ubiquiti device detected but ubiquiti file not available\n");
-                                return 1;
+                                goto sock_close;
                         }
                 } else {
                         if (!ubnt_img) {
                                 fprintf(stderr, "Error - you are trying to flash a ubiquiti device with redboot images!\n");
-                                return 1;
+                                goto sock_close;
                         }
                 }
@@ -911 +889 @@
         default:
                 fprintf(stderr, "Error - could not auto-detect flash mode!\n");
-                return 1;
-        }
-
-        return fw_upload();
+                goto sock_close;
+        }
+
+        ret = fw_upload();
+
+sock_close:
+        socket_close(socket_dev);
+        return ret;
 }
 

ap51-flash/trunk/ap51-flash.h

@@ -20 +20 @@
 #define __ap51_FLASH_H__
 
-#include <pcap.h>
 #include "uipopt.h"
 #include "psock.h"
@@ -27 +26 @@
 /* WIN32 */
 #include <windows.h>
+#include <pcap.h>
 #include "ap51-flash-res.h"
 #include "missing-win32.h"
 #define PCAP_TIMEOUT_MS 1000
+#if defined(NO_LIBPCAP)
+#error NO_LIBPCAP supported on Linux only
+#endif
 #elif defined(OSX)
 /* OSX */
+#include <pcap.h>
 #define O_BINARY 0
 #include <unistd.h>
@@ -41 +45 @@
 #undef HTONS
 #define PCAP_TIMEOUT_MS 200
+#if defined(NO_LIBPCAP)
+#error NO_LIBPCAP supported on Linux only
+#endif
 #elif defined(LINUX)
 /* Linux */
@@ -52 +59 @@
 #include <arpa/inet.h>
 #define PCAP_TIMEOUT_MS 200
+#if !defined(NO_LIBPCAP)
+#include <pcap.h>
+#endif
 #else
 #error Unsupported PLATFORM
@@ -76 +86 @@
         int flash_size;
         char *fname;
-        char buff[2];
+        unsigned char buff[2];
 };
 
@@ -125 +135 @@
 void handle_uip_conns(void);
 
-extern pcap_t *pcap_fp;
 extern unsigned int remote_ip;
 extern unsigned int local_ip;

ap51-flash/trunk/main.c

@@ -25 +25 @@
 
 #include "ap51-flash.h"
+#include "socket.h"
 
 void usage(char *prgname)
 {
-        pcap_if_t *alldevs;
-        pcap_if_t *d;
-        int i=0;
-        char errbuf[PCAP_ERRBUF_SIZE];
-
         fprintf(stderr, "Usage:\n");
 
@@ -55 +51 @@
         fprintf(stderr, "\nThe 'ethdevice' has to be one of the devices that are part of the supported device list which follows.\nYou can either specify its name or the interface number.\n");
 
-        /* Retrieve the device list from the local machine */
-        if (pcap_findalldevs(&alldevs, errbuf) == -1) {
-                fprintf(stderr,"Error in pcap_findalldevs_ex: %s\n", errbuf);
-                return;
-        }
-
-        /* Print the list */
-        for(d = alldevs; d != NULL; d = d->next) {
-                i++;
-                fprintf(stderr, "\n%i: %s\n", i, d->name);
-
-                if (!d->description) {
-                        fprintf(stderr, "\t(No description available)\n");
-                        continue;
-                }
-
-                unsigned char* p = (unsigned char*)d->description;
-                unsigned char c = 0;
-                fprintf(stderr, "\t(Description: ");
-                while (' ' <= *p) {
-                        if (c != ' ' || c != *p)
-                                fprintf(stderr, "%c", *p);
-                        c = *p++;
-                }
-                fprintf(stderr, ")\n");
-        }
+        socket_print_all_devices();
 }
 

ap51-flash/trunk/missing-osx.h

@@ -29 +29 @@
 #define IPPORT_TFTP 69
 
-struct iphdr {
+/*struct iphdr {
         unsigned int ihl:4;
         unsigned int version:4;
@@ -41 +41 @@
         u_int32_t saddr;
         u_int32_t daddr;
-};
+};*/
 
 struct udphdr {

ap51-flash/trunk/packet.c

@@ -17 +17 @@
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "packet.h"
+#include "ap51-flash.h"
+#include "socket.h"
 
 #define PACKET_BUFF_LEN 1500
@@ -33 +36 @@
 unsigned long tftp_bytes_sent = 0;
 unsigned short tftp_ack_block = 0, tftp_sent_block = 0, xfer_in_progress = 0, write_req_timeout = 4;
+char tcp_status = TCP_CONTINUE;
 
 
@@ -50 +54 @@
 void arp_packet_send(void)
 {
-        if (!pcap_sendpacket(pcap_fp, packet_buff, ARP_LEN))
-                return;
-
-        perror("pcap_sendpacket");
-        exit(1);
+        socket_write(packet_buff, ARP_LEN);
 }
 
@@ -73 +73 @@
 }
 
-static void tftp_packet_send(int tftp_data_len)
+static int tftp_packet_send(int tftp_data_len)
 {
         unsigned short sum;
@@ -100 +100 @@
 #endif
 
-        if (!pcap_sendpacket(pcap_fp, packet_buff, TFTP_BASE_LEN + tftp_data_len))
-                return;
-
-        perror("pcap_sendpacket");
-        exit(1);
-}
-
-static void tftp_write_req(void)
+        return socket_write(packet_buff, TFTP_BASE_LEN + tftp_data_len);
+}
+
+static int tftp_write_req(void)
 {
         int tftp_data_len;
@@ -120 +116 @@
         tftp_data_len += 2; /* sprintf does not count \0 */
 
-        tftp_packet_send(tftp_data_len);
-}
-
-static void read_from_file(void *target_buff, void *data, int len, int seek_pos)
+        return tftp_packet_send(tftp_data_len);
+}
+
+static int read_from_file(void *target_buff, void *data, int len, int seek_pos)
 {
         struct flash_from_file *fff = (struct flash_from_file *)data;
@@ -136 +132 @@
                 if (read_len != read(fff->fd, target_buff, read_len)) {
                         perror(fff->fname);
-                        exit(1);
+                        return 1;
                 }
         }
@@ -145 +141 @@
         if (seek_pos == 0)
                 memcpy(fff->buff, target_buff, 2);
-}
-
-static void tftp_transfer(const unsigned char *packet_buff, unsigned int packet_len)
+
+        return 0;
+}
+
+static int tftp_transfer(const unsigned char *packet_buff, unsigned int packet_len)
 {
         struct udphdr *rcv_udphdr = (struct udphdr *)packet_buff;
         unsigned short opcode, block;
         char *file_name;
-        int tftp_data_len;
+        int tftp_data_len, ret;
 
         if ((flash_mode == MODE_REDBOOT) && (rcv_udphdr->dest != htons(IPPORT_TFTP)))
-                return;
+                return 1;
 
         if ((flash_mode == MODE_TFTP_CLIENT) && (rcv_udphdr->source != htons(IPPORT_TFTP)))
-                return;
+                return 1;
 
         opcode = ntohs(*(unsigned short *)(((char *)rcv_udphdr) + sizeof(struct udphdr)));
@@ -181 +179 @@
                 } else {
                         fprintf(stderr, "Unknown file name: %s\n", file_name);
-                        exit(1);
+                        return -1;
                 }
 
@@ -210 +208 @@
                                         printf("Image successfully transmitted.\n");
                                         printf("Please give the device a couple of minutes to install the new image into the flash.\n");
-                                        exit(0);
+                                        return 0;
                                 }
-                                return;
+                                return 1;
                         }
 
@@ -226 +224 @@
                 tftp_data_len = tftp_xfer_size - tftp_bytes_sent > 512 ? 512 : tftp_xfer_size - tftp_bytes_sent;
 
-                if (flash_from_file)
-                        read_from_file(tftp_data + 4, (void *)tftp_xfer_buff, tftp_data_len, tftp_bytes_sent);
-                else
+                if (flash_from_file) {
+                        ret = read_from_file(tftp_data + 4, (void *)tftp_xfer_buff, tftp_data_len, tftp_bytes_sent);
+                        if (ret != 0)
+                                return -1;
+                } else {
                         memcpy(tftp_data + 4, (void *)(tftp_xfer_buff + tftp_bytes_sent), tftp_data_len);
+                }
 
                 tftp_bytes_sent += tftp_data_len;
                 tftp_data_len += 4; /* opcode size */
-                tftp_packet_send(tftp_data_len);
+
+                ret = tftp_packet_send(tftp_data_len);
+                if (ret != 0)
+                        return -1;
+
                 tftp_sent_block = block;
                 /* printf("tftp data out: tftp_sent=%lu, remaining_size=%lu, data_len=%i, block=%d\n",
@@ -245 +250 @@
                 else
                         fprintf(stderr, "Received TFTP error code: %d\n", block);
-                exit(1);
+
+                return -1;
                 break;
         default:
                 fprintf(stderr, "Unexpected TFTP opcode: %d\n", opcode);
-                exit(1);
+                return -1;
                 break;
         }
+
+        return 1;
 }
 
@@ -257 +265 @@
 {
         const unsigned char *packet;
-        struct pcap_pkthdr hdr;
         struct ether_arp *rcv_arphdr;
         struct iphdr *rcv_iphdr;
+        int len, ret;
 
         if (flash_mode == MODE_TFTP_CLIENT) {
                 printf("Trying to connect to TFTP server on the device ..\n");
-                tftp_write_req();
+                ret = tftp_write_req();
+                if (ret != 0)
+                        return ret;
         }
 
         while (1) {
-                packet = pcap_next(pcap_fp, &hdr);
+                packet = socket_read(&len);
+
+                if ((flash_mode == MODE_REDBOOT) && (tcp_status != TCP_CONTINUE)) {
+                        switch (tcp_status) {
+                        case TCP_SUCCESS:
+                                return 0;
+                        case TCP_ERROR:
+                                return 1;
+                        default:
+                                tcp_status = TCP_CONTINUE;
+                        }
+                }
 
                 if (!packet) {
@@ -286 +307 @@
                                 fprintf(stderr, "TFTP connection timeout .. \n");
                                 tftp_write_req();
+                                if (ret != 0)
+                                        return ret;
+
                                 write_req_timeout = 2;
                         }
@@ -295 +319 @@
                 switch (ntohs(((struct ether_header *)packet)->ether_type)) {
                 case ETHERTYPE_ARP:
-                        if (hdr.len < 60) {
-                                /* fprintf(stderr, "Expected arp with minimum length %i, received %d\n", 60, hdr.len); */
+                        if (len < 60) {
+                                /* fprintf(stderr, "Expected arp with minimum length %i, received %d\n", 60, len); */
                                 continue;
                         }
@@ -332 +356 @@
                         break;
                 case ETH_P_IP:
-                        if (hdr.len < 20) {
-                                fprintf(stderr, "Expected IP with minimum length %i, received %d\n", 20, hdr.len);
+                        if (len < 20) {
+                                fprintf(stderr, "Expected IP with minimum length %i, received %d\n", 20, len);
                                 continue;
                         }
@@ -351 +375 @@
                         switch (rcv_iphdr->protocol) {
                         case IPPROTO_UDP:
-                                tftp_transfer(packet + ETH_HLEN + (rcv_iphdr->ihl * 4),
-                                              hdr.len - ETH_HLEN - (rcv_iphdr->ihl * 4));
+                                ret = tftp_transfer(packet + ETH_HLEN + (rcv_iphdr->ihl * 4),
+                                                    len - ETH_HLEN - (rcv_iphdr->ihl * 4));
+
+                                if (ret < 0)
+                                        return 1;  /* error */
+                                else if (ret == 0)
+                                        return 0;  /* flash successful */
                                 break;
                         case IPPROTO_TCP:
-                                handle_uip_tcp(packet, hdr.len);
+                                handle_uip_tcp(packet, len);
                                 break;
                         default:

ap51-flash/trunk/packet.h

@@ -17 +17 @@
  */
 
-#include "ap51-flash.h"
-
 #define TFTP_SRC_PORT 13337
 #define TELNET_PORT 9000
 #define ARP_LEN (sizeof(struct ether_header) + sizeof(struct ether_arp))
 #define TFTP_BASE_LEN (sizeof(struct ether_header) + sizeof(struct iphdr) + sizeof(struct udphdr))
+
+#define TCP_CONTINUE 0
+#define TCP_SUCCESS 1
+#define TCP_ERROR -1
 
 extern struct ether_header *ethhdr;
@@ -31 +33 @@
 extern unsigned long tftp_bytes_sent;
 extern unsigned short xfer_in_progress;
+extern char tcp_status;
 
 void arp_packet_init(void);

ap51-flash/trunk/socket.h

@@ -17 +17 @@
  */
 
-#include "ap51-flash.h"
-
-#define TFTP_SRC_PORT 13337
-#define TELNET_PORT 9000
-#define ARP_LEN (sizeof(struct ether_header) + sizeof(struct ether_arp))
-#define TFTP_BASE_LEN (sizeof(struct ether_header) + sizeof(struct iphdr) + sizeof(struct udphdr))
-
-extern struct ether_header *ethhdr;
-extern struct ether_arp *arphdr;
-extern struct iphdr *iphdr;
-extern struct udphdr *udphdr;
-extern void *tftp_data;
-extern unsigned long tftp_bytes_sent;
-extern unsigned short xfer_in_progress;
-
-void arp_packet_init(void);
-void arp_packet_send(void);
-int fw_upload(void);
+char *socket_find_dev_by_index(char *number);
+void socket_print_all_devices(void);
+int socket_open(char *dev);
+int socket_setnonblock(void);
+unsigned char *socket_read(int *len);
+int socket_write(unsigned char *buff, int len);
+void socket_close(char *dev);