Issue #17. Fixed warnings (part three)

include/pico_constants.h

@@ -8,7 +8,7 @@ See LICENSE and COPYING for usage.
 /* Included from pico_config.h */
 /** Endian-dependant constants **/
 
-extern volatile uint64_t pico_tick;
+extern volatile unsigned long pico_tick;
 
 #ifdef PICO_BIGENDIAN
 

include/pico_device.h

@@ -23,7 +23,7 @@ struct pico_device {
   struct pico_ethdev *eth; /* Null if non-ethernet */
   struct pico_queue *q_in;
   struct pico_queue *q_out;
-  uint32_t (*send)(struct pico_device *self, void *buf, uint32_t len); /* Send function. Return 0 if busy */
+  int (*send)(struct pico_device *self, void *buf, int len); /* Send function. Return 0 if busy */
   int (*poll)(struct pico_device *self, int loop_score);
   void(*destroy)(struct pico_device *self);
   int (*dsr)(struct pico_device *self, int loop_score);

include/pico_frame.h

@@ -47,7 +47,7 @@ struct pico_frame {
    */
   struct pico_device *dev;
 
-  uint64_t timestamp;
+  uint32_t timestamp;
 
   /* Failures due to bad datalink addressing. */
   uint16_t failure_count;

include/pico_stack.h

@@ -62,7 +62,7 @@ struct pico_timer;
 int pico_source_is_local(struct pico_frame *f);
 int pico_destination_is_local(struct pico_frame *f);
 void pico_store_network_origin(void *src, struct pico_frame *f);
-struct pico_timer *pico_timer_add(uint64_t expire, void (*timer)(uint64_t, void *), void *arg);
+struct pico_timer *pico_timer_add(uint32_t expire, void (*timer)(uint32_t, void *), void *arg);
 void pico_timer_cancel(struct pico_timer *t);
 uint32_t pico_rand(void);
 void pico_rand_feed(uint32_t feed);

modules/pico_dev_loop.c

@@ -13,17 +13,17 @@ Authors: Daniele Lacamera
 
 #define LOOP_MTU 1500
 static uint8_t l_buf[LOOP_MTU];
-static uint32_t l_bufsize = 0;
+static int l_bufsize = 0;
 
 
-static uint32_t pico_loop_send(struct pico_device *dev, void *buf, uint32_t len)
+static int pico_loop_send(struct pico_device *dev, void *buf, int len)
 {
 	IGNORE_PARAMETER(dev);
 	if (len > LOOP_MTU)
     return 0;
 
   if (l_bufsize == 0) {
-    memcpy(l_buf, buf, len);
+    memcpy(l_buf, buf, (size_t)len);
     l_bufsize+=len;
     return len;
   }
@@ -36,7 +36,7 @@ static int pico_loop_poll(struct pico_device *dev, int loop_score)
     return 0;
 
   if (l_bufsize > 0) {
-    pico_stack_recv(dev, l_buf, l_bufsize);
+    pico_stack_recv(dev, l_buf, (uint32_t)l_bufsize);
     l_bufsize = 0;
     loop_score--;
   }

modules/pico_dhcp_client.c

@@ -67,7 +67,7 @@ struct pico_dhcp_client_cookie
   uint32_t *uid;
   enum dhcp_client_state state;
   void (*cb)(void* dhcpc, int code);
-  uint64_t init_timestamp;
+  uint32_t init_timestamp;
   struct pico_socket *s;
   struct pico_ip4 address;
   struct pico_ip4 netmask;
@@ -156,7 +156,7 @@ static struct pico_dhcp_client_cookie *pico_dhcp_client_find_cookie(uint32_t xid
     return NULL;
 }
 
-static void pico_dhcp_client_init_timer(uint64_t __attribute__((unused)) now, void *arg)
+static void pico_dhcp_client_init_timer(uint32_t __attribute__((unused)) now, void *arg)
 {
   struct pico_dhcp_client_cookie *dhcpc = (struct pico_dhcp_client_cookie *)arg;
 
@@ -178,7 +178,7 @@ static void pico_dhcp_client_init_timer(uint64_t __attribute__((unused)) now, vo
   return;
 }
 
-static void pico_dhcp_client_requesting_timer(uint64_t __attribute__((unused)) now, void *arg)
+static void pico_dhcp_client_requesting_timer(uint32_t __attribute__((unused)) now, void *arg)
 {
   struct pico_dhcp_client_cookie *dhcpc = (struct pico_dhcp_client_cookie *)arg;
 
@@ -198,7 +198,7 @@ static void pico_dhcp_client_requesting_timer(uint64_t __attribute__((unused)) n
   return;
 }
 
-static void pico_dhcp_client_renewing_timer(uint64_t __attribute__((unused)) now, void *arg)
+static void pico_dhcp_client_renewing_timer(uint32_t __attribute__((unused)) now, void *arg)
 {
   struct pico_dhcp_client_cookie *dhcpc = (struct pico_dhcp_client_cookie *)arg;
 
@@ -213,7 +213,7 @@ static void pico_dhcp_client_renewing_timer(uint64_t __attribute__((unused)) now
   return;
 }
 
-static void pico_dhcp_client_rebinding_timer(uint64_t __attribute__((unused)) now, void *arg)
+static void pico_dhcp_client_rebinding_timer(uint32_t __attribute__((unused)) now, void *arg)
 {
   struct pico_dhcp_client_cookie *dhcpc = (struct pico_dhcp_client_cookie *)arg;
 
@@ -228,7 +228,7 @@ static void pico_dhcp_client_rebinding_timer(uint64_t __attribute__((unused)) no
   return;
 }
 
-static void pico_dhcp_client_T1_timer(uint64_t __attribute__((unused)) now, void *arg)
+static void pico_dhcp_client_T1_timer(uint32_t __attribute__((unused)) now, void *arg)
 {
   struct pico_dhcp_client_cookie *dhcpc = (struct pico_dhcp_client_cookie *)arg;
 
@@ -242,7 +242,7 @@ static void pico_dhcp_client_T1_timer(uint64_t __attribute__((unused)) now, void
   return;
 }
 
-static void pico_dhcp_client_T2_timer(uint64_t __attribute__((unused)) now, void *arg)
+static void pico_dhcp_client_T2_timer(uint32_t __attribute__((unused)) now, void *arg)
 {
   struct pico_dhcp_client_cookie *dhcpc = (struct pico_dhcp_client_cookie *)arg;
 
@@ -257,7 +257,7 @@ static void pico_dhcp_client_T2_timer(uint64_t __attribute__((unused)) now, void
   return;
 }
 
-static void pico_dhcp_client_lease_timer(uint64_t __attribute__((unused)) now, void *arg)
+static void pico_dhcp_client_lease_timer(uint32_t __attribute__((unused)) now, void *arg)
 {
   struct pico_dhcp_client_cookie *dhcpc = (struct pico_dhcp_client_cookie *)arg;
 
@@ -272,7 +272,7 @@ static void pico_dhcp_client_lease_timer(uint64_t __attribute__((unused)) now, v
   return;
 }
 
-static void pico_dhcp_client_reinit(uint64_t __attribute__((unused)) now, void *arg)
+static void pico_dhcp_client_reinit(uint32_t __attribute__((unused)) now, void *arg)
 {
   struct pico_dhcp_client_cookie *dhcpc = (struct pico_dhcp_client_cookie *)arg;
 
@@ -813,7 +813,7 @@ static int8_t pico_dhcp_client_msg(struct pico_dhcp_client_cookie *dhcpc, uint8_
       optlen = PICO_DHCP_OPTLEN_MSGTYPE + PICO_DHCP_OPTLEN_MAXMSGSIZE + PICO_DHCP_OPTLEN_PARAMLIST + PICO_DHCP_OPTLEN_END;
       hdr = pico_zalloc((size_t)(sizeof(struct pico_dhcp_hdr) + optlen));
       /* specific options */
-      offset += pico_dhcp_opt_maxmsgsize(&hdr->options[offset], DHCP_CLIENT_MAXMSGZISE);
+      offset = (uint16_t)(offset + pico_dhcp_opt_maxmsgsize(&hdr->options[offset], DHCP_CLIENT_MAXMSGZISE));
       break;
 
     case PICO_DHCP_MSG_REQUEST:
@@ -822,10 +822,10 @@ static int8_t pico_dhcp_client_msg(struct pico_dhcp_client_cookie *dhcpc, uint8_
               + PICO_DHCP_OPTLEN_END;
       hdr = pico_zalloc(sizeof(struct pico_dhcp_hdr) + optlen);
       /* specific options */
-      offset += pico_dhcp_opt_maxmsgsize(&hdr->options[offset], DHCP_CLIENT_MAXMSGZISE);
+      offset = (uint16_t)(offset+pico_dhcp_opt_maxmsgsize(&hdr->options[offset], DHCP_CLIENT_MAXMSGZISE));
       if (dhcpc->state == DHCP_CLIENT_STATE_REQUESTING) {
-        offset += pico_dhcp_opt_reqip(&hdr->options[offset], &dhcpc->address);
-        offset += pico_dhcp_opt_serverid(&hdr->options[offset], &dhcpc->server_id);
+        offset = (uint16_t)(offset+pico_dhcp_opt_reqip(&hdr->options[offset], &dhcpc->address));
+        offset = (uint16_t)(offset+pico_dhcp_opt_serverid(&hdr->options[offset], &dhcpc->server_id));
       }
       break;
 
@@ -834,9 +834,9 @@ static int8_t pico_dhcp_client_msg(struct pico_dhcp_client_cookie *dhcpc, uint8_
   }
 
   /* common options */
-  offset += pico_dhcp_opt_msgtype(&hdr->options[offset], msg_type);
-  offset += pico_dhcp_opt_paramlist(&hdr->options[offset]);
-  offset += pico_dhcp_opt_end(&hdr->options[offset]);
+  offset = (uint16_t)(offset+pico_dhcp_opt_msgtype(&hdr->options[offset], msg_type));
+  offset = (uint16_t)(offset+pico_dhcp_opt_paramlist(&hdr->options[offset]));
+  offset = (uint16_t)(offset+pico_dhcp_opt_end(&hdr->options[offset]));
 
   switch (dhcpc->state)
   {

modules/pico_dns_client.c

@@ -73,7 +73,7 @@ Authors: Kristof Roelants
 #define PICO_DNS_IPV4_ADDR_LEN 16
 
 static void pico_dns_client_callback(uint16_t ev, struct pico_socket *s);
-static void pico_dns_client_retransmission(uint64_t now, void *arg);
+static void pico_dns_client_retransmission(uint32_t now, void *arg);
 
 /* RFC 1035 section 4. MESSAGES */
 struct __attribute__((packed)) pico_dns_name
@@ -516,7 +516,7 @@ static int pico_dns_client_send(struct pico_dns_query *q)
   return 0;
 }
 
-static void pico_dns_client_retransmission(uint64_t now, void *arg)
+static void pico_dns_client_retransmission(uint32_t now, void *arg)
 {
   struct pico_dns_query *q = NULL;
   struct pico_dns_query dummy;

modules/pico_http_server.c

@@ -583,7 +583,7 @@ void sendData(struct httpClient * client)
 	while( client->bufferSent < client->bufferSize &&
 	(length = (uint16_t)pico_socket_write(client->sck,client->buffer+client->bufferSent,client->bufferSize-client->bufferSent)) > 0 )
 	{
-		client->bufferSent += length;
+		client->bufferSent = (uint16_t)(client->bufferSent + length);
 		server.wakeup(EV_HTTP_PROGRESS,client->connectionID);
 	}
 

modules/pico_icmp4.c

@@ -158,7 +158,7 @@ struct pico_icmp4_ping_cookie
   uint16_t seq;
   uint16_t size;
   int count;
-  uint64_t timestamp;
+  uint32_t timestamp;
   int interval;
   int timeout;
   void (*cb)(struct pico_icmp4_stats*);
@@ -198,7 +198,7 @@ static uint8_t pico_icmp4_send_echo(struct pico_icmp4_ping_cookie *cookie)
 }
 
 
-static void ping_timeout(uint64_t now, void *arg)
+static void ping_timeout(uint32_t now, void *arg)
 {
   struct pico_icmp4_ping_cookie *cookie = (struct pico_icmp4_ping_cookie *)arg;
   IGNORE_PARAMETER(now);
@@ -220,7 +220,7 @@ static void ping_timeout(uint64_t now, void *arg)
   }
 }
 
-static void next_ping(uint64_t now, void *arg);
+static void next_ping(uint32_t now, void *arg);
 static inline void send_ping(struct pico_icmp4_ping_cookie *cookie)
 {
   pico_icmp4_send_echo(cookie);
@@ -230,7 +230,7 @@ static inline void send_ping(struct pico_icmp4_ping_cookie *cookie)
     pico_timer_add((long unsigned int)cookie->interval, next_ping, cookie);
 }
 
-static void next_ping(uint64_t now, void *arg)
+static void next_ping(uint32_t now, void *arg)
 {
   struct pico_icmp4_ping_cookie *newcookie, *cookie = (struct pico_icmp4_ping_cookie *)arg;
   IGNORE_PARAMETER(now);

modules/pico_icmp4.h

@@ -129,7 +129,7 @@ struct pico_icmp4_stats
   struct pico_ip4 dst;
   unsigned long size;
   unsigned long seq;
-  uint64_t time;
+  uint32_t time;
   unsigned long ttl;
   int err;
 };

modules/pico_igmp.c

@@ -129,8 +129,8 @@ struct igmp_parameters {
 struct igmp_timer {
   uint8_t type;
   uint8_t stopped;
-  uint64_t start;
-  uint64_t delay;
+  uint32_t start;
+  uint32_t delay;
   struct pico_ip4 mcast_link;
   struct pico_ip4 mcast_group;
   struct pico_frame *f;
@@ -212,7 +212,7 @@ static int pico_igmp_delete_parameter(struct igmp_parameters *p)
   return 0;
 }
 
-static void pico_igmp_timer_expired(uint64_t now, void *arg)
+static void pico_igmp_timer_expired(uint32_t now, void *arg)
 {
   struct igmp_timer *t = NULL, *timer = NULL, test = {0};
 
@@ -619,9 +619,9 @@ static int8_t pico_igmp_generate_report(struct igmp_parameters *p)
         report_type = IGMP_TYPE_LEAVE_GROUP;
 
       p->f = pico_proto_ipv4.alloc(&pico_proto_ipv4, IP_OPTION_ROUTER_ALERT_LEN + sizeof(struct igmp_message));
-      p->f->net_len += IP_OPTION_ROUTER_ALERT_LEN;
+      p->f->net_len = (uint16_t)(p->f->net_len + IP_OPTION_ROUTER_ALERT_LEN);
       p->f->transport_hdr += IP_OPTION_ROUTER_ALERT_LEN;
-      p->f->transport_len -= IP_OPTION_ROUTER_ALERT_LEN;
+      p->f->transport_len = (uint16_t)(p->f->transport_len - IP_OPTION_ROUTER_ALERT_LEN);
       p->f->dev = pico_ipv4_link_find(&p->mcast_link);
       /* p->f->len is correctly set by alloc */
 
@@ -821,9 +821,9 @@ static int8_t pico_igmp_generate_report(struct igmp_parameters *p)
 
       len = (uint16_t)(sizeof(struct igmpv3_report) + sizeof(struct igmpv3_group_record) + (sources * sizeof(struct pico_ip4)));
       p->f = pico_proto_ipv4.alloc(&pico_proto_ipv4, (uint16_t)(IP_OPTION_ROUTER_ALERT_LEN + len));
-      p->f->net_len += IP_OPTION_ROUTER_ALERT_LEN;
+      p->f->net_len = (uint16_t)(p->f->net_len + IP_OPTION_ROUTER_ALERT_LEN);
       p->f->transport_hdr += IP_OPTION_ROUTER_ALERT_LEN;
-      p->f->transport_len -= IP_OPTION_ROUTER_ALERT_LEN;
+      p->f->transport_len = (uint16_t)(p->f->transport_len - IP_OPTION_ROUTER_ALERT_LEN);
       p->f->dev = pico_ipv4_link_find(&p->mcast_link);
       /* p->f->len is correctly set by alloc */
 
@@ -1068,7 +1068,7 @@ static int srsf(struct igmp_parameters *p)
 static int rtimrtct(struct igmp_parameters *p)
 {
   struct igmp_timer *t = NULL;
-  uint64_t time_to_run = 0;
+  uint32_t time_to_run = 0;
 
   igmp_dbg("IGMP: event = query received | action = reset timer if max response time < current timer\n");
 

modules/pico_ipv4.c

@@ -297,7 +297,7 @@ static inline int8_t pico_ipv4_fragmented_check(struct pico_protocol *self, stru
       frag.dst.addr = long_be(hdr->dst.addr);
       pfrag = pico_tree_findKey(&pico_ipv4_fragmented_tree, &frag);
       if (pfrag) {
-        pfrag->total_len += (short_be(hdr->len) - (*f)->net_len);
+        pfrag->total_len = (uint16_t)(pfrag->total_len + (short_be(hdr->len) - (*f)->net_len));
         pico_tree_insert(pfrag->t, *f);
         return 0;
       } else {
@@ -314,7 +314,7 @@ static inline int8_t pico_ipv4_fragmented_check(struct pico_protocol *self, stru
     frag.dst.addr = long_be(hdr->dst.addr);
     pfrag = pico_tree_findKey(&pico_ipv4_fragmented_tree, &frag);
     if (pfrag) {
-      pfrag->total_len += (short_be(hdr->len) - (*f)->net_len);
+      pfrag->total_len = (uint16_t)(pfrag->total_len + (short_be(hdr->len) - (*f)->net_len));
       reassembly_dbg("REASSEMBLY: fragmented packet in tree, reassemble packet of %u data bytes\n", pfrag->total_len);
       f_new = self->alloc(self, pfrag->total_len);
 
@@ -344,7 +344,7 @@ static inline int8_t pico_ipv4_fragmented_check(struct pico_protocol *self, stru
           pico_ipv4_fragmented_cleanup(pfrag);
           return -1;
         }
-        running_offset += (data_len / 8);
+        running_offset = (uint16_t)(running_offset + (data_len / 8));
         pico_tree_delete(pfrag->t, f_frag);
         pico_frame_discard(f_frag);
         reassembly_dbg("REASSEMBLY: reassembled intermediate packet of %u data bytes, offset = %u next expected offset = %u\n", data_len, offset, running_offset);
@@ -1368,7 +1368,7 @@ static int pico_ipv4_forward(struct pico_frame *f)
   }
 
   f->dev = rt->link->dev;
-  hdr->ttl-=1;
+  hdr->ttl= (uint8_t)(hdr->ttl - 1);
   if (hdr->ttl < 1) {
     pico_notify_ttl_expired(f);
     return -1;

modules/pico_nat.c

@@ -268,7 +268,7 @@ static int pico_ipv4_nat_snif_session(struct pico_nat_tuple *t, struct pico_fram
   return 0;
 }
 
-static void pico_ipv4_nat_table_cleanup(uint64_t now, void *_unused)
+static void pico_ipv4_nat_table_cleanup(uint32_t now, void *_unused)
 {
   struct pico_tree_node *index = NULL, *_tmp = NULL;
   struct pico_nat_tuple *t = NULL;