--- a/packages/net/common/current/ChangeLog
+++ b/packages/net/common/current/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-29  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* src/tftp_dummy_file.c: unsigned char when needed to prevent warnings.
+	* src/tftp_server.c: fromlen in recvfrom should be of socklen_t.
+	* src/tftp_client.c: fromlen in recvfrom should be of socklen_t.
+	* src/dhcp_prot.c (do_dhcp): Casts etc so that it compiles cleanly
+	with gcc4.0
+
 2005-03-27  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* src/tftp_server.c (tftpd_server): Fixed compiler warning about

--- a/packages/net/common/current/src/bootp_support.c
+++ b/packages/net/common/current/src/bootp_support.c
@@ -86,7 +86,8 @@ do_bootp(const char *intf, struct bootp 
     struct ifreq ifr;
     struct sockaddr_in cli_addr, serv_addr, bootp_server_addr;
     struct ecos_rtentry route;
-    int s=-1, addrlen;
+    int s=-1;
+    socklen_t addrlen;
     int one = 1;
     struct bootp bootp_xmit;
     unsigned char mincookie[] = {99,130,83,99,255} ;
@@ -263,7 +264,8 @@ void
 show_bootp(const char *intf, struct bootp *bp)
 {
     int i, len;
-    unsigned char *op, *ap = 0, optover;
+    unsigned char *op, optover;
+    char  *ap = 0;
     unsigned char name[128];
     struct in_addr addr[32];
     unsigned int length;
@@ -305,7 +307,7 @@ show_bootp(const char *intf, struct boot
             case TAG_GATEWAY:
             case TAG_IP_BROADCAST:
             case TAG_DOMAIN_SERVER:
-                ap = (unsigned char *)&addr[0];
+                ap = (char *)&addr[0];
                 len = *(op+1);
                 for (i = 0;  i < len;  i++) {
                     *ap++ = *(op+i+2);
@@ -315,7 +317,7 @@ show_bootp(const char *intf, struct boot
                 if (*op == TAG_IP_BROADCAST)  ap =  " IP broadcast";
                 if (*op == TAG_DOMAIN_SERVER) ap =  "domain server";
                 diag_printf("      %s: ", ap);
-                ap = (unsigned char *)&addr[0];
+                ap = (char *)&addr[0];
                 while (len > 0) {
                     diag_printf("%s", inet_ntoa(*(struct in_addr *)ap));
                     len -= sizeof(struct in_addr);
@@ -431,10 +433,10 @@ CYG_MACRO_END
         return false;
 
     if ( 1 & optover ) // then the file field also holds options
-        SCANTAG( &bp->bp_file[0] );
+        SCANTAG( (unsigned char *)&bp->bp_file[0] );
 
     if ( 2 & optover ) // then the sname field also holds options
-        SCANTAG( &bp->bp_sname[0] );
+        SCANTAG( (unsigned char *)&bp->bp_sname[0] );
 
     return false;
 }

--- a/packages/net/common/current/src/dhcp_prot.c
+++ b/packages/net/common/current/src/dhcp_prot.c
@@ -602,7 +602,8 @@ do_dhcp(const char *intf, struct bootp *
 {
     struct ifreq ifr;
     struct sockaddr_in cli_addr, broadcast_addr, server_addr, rx_addr;
-    int s = -1, addrlen;
+    int s = -1;
+    socklen_t addrlen;
     int one = 1;
     unsigned char mincookie[] = {99,130,83,99,255} ;
     struct timeval tv;
@@ -1183,7 +1184,7 @@ do_dhcp(const char *intf, struct bootp *
 
             if ( 0 == received->bp_siaddr.s_addr ) {
                 // then fill in from the options...
-                int length = sizeof(received->bp_siaddr.s_addr );
+                unsigned int length = sizeof(received->bp_siaddr.s_addr );
                 get_bootp_option( received, TAG_DHCP_SERVER_ID,
                                   &received->bp_siaddr.s_addr,
                                   &length);

--- a/packages/net/common/current/src/tftp_client.c
+++ b/packages/net/common/current/src/tftp_client.c
@@ -76,7 +76,8 @@ int tftp_client_get(char *filename,
 		    
     int result = 0;
     int s=-1;
-    int actual_len, data_len, recv_len, from_len;
+    int actual_len, data_len;
+    socklen_t from_len, recv_len;
     static int get_port = 7700;
     struct addrinfo * addrinfo;
     struct addrinfo * res;
@@ -358,7 +359,8 @@ int tftp_client_put(char *filename,
 		    int *err) {
 
     int result = 0;
-    int s = -1, actual_len, data_len, recv_len, from_len;
+    int s = -1, actual_len, data_len;
+    socklen_t recv_len, from_len;
     static int put_port = 7800;
     struct sockaddr local_addr, from_addr;
     char data[SEGSIZE+sizeof(struct tftphdr)];

--- a/packages/net/common/current/src/tftp_dummy_file.c
+++ b/packages/net/common/current/src/tftp_dummy_file.c
@@ -84,7 +84,7 @@ struct _file_info {
 };
 
 // TEMP
-static char _uu_data[] = "This is a test\n\
+static unsigned char _uu_data[] = "This is a test\n\
 Four score and seven years ago,\n\
 our forefathers brought forth a new nation,\n\
 conceived in liberty and dedicated to the\n\
@@ -100,9 +100,9 @@ 5555555555555555555555555555555555\n\
 6666666666666666666666666666666666\n\
 ";
 
-static char _f0_data[1024*1024];
-static char _f1_data[1024*1024];
-static char _f2_data[1024*1024];
+static unsigned char _f0_data[1024*1024];
+static unsigned char _f1_data[1024*1024];
+static unsigned char _f2_data[1024*1024];
 
 static char _name0[256] = "", _name1[256] = "", _name2[256] = "";
 

--- a/packages/net/common/current/src/tftp_server.c
+++ b/packages/net/common/current/src/tftp_server.c
@@ -235,7 +235,7 @@ tftpd_write_file(struct tftp_server *ser
     struct sockaddr client_addr;
     struct addrinfo hints;
     struct addrinfo *res;
-    int client_len;
+    socklen_t client_len;
     int error;
     
     memset(&hints,0,sizeof(hints));
@@ -403,7 +403,7 @@ tftpd_read_file(struct tftp_server *serv
     struct sockaddr client_addr;
     struct addrinfo hints;
     struct addrinfo *res;
-    int client_len;
+    socklen_t client_len;
     int error;
 
     memset(&hints,0,sizeof(hints));
@@ -539,7 +539,8 @@ tftpd_server(cyg_addrword_t p)
 {
     struct tftp_server *server = (struct tftp_server *)p;
     int max_s = 0;
-    int data_len, recv_len, from_len;
+    int data_len, recv_len;
+    socklen_t from_len;
     struct sockaddr from_addr;
     char data[SEGSIZE+sizeof(struct tftphdr)];
     struct tftphdr *hdr = (struct tftphdr *)data;