Fix various compiler warnings throughout the code

Mostly signed/unsigned and typecasting issues

Taken from http://sourceforge.net/tracker/index.php?func=detail&aid=1811517&group_id=68956&atid=522957

4 files changed, 42 insertions, 42 deletions

diff --git a/gtp/gtp.c b/gtp/gtp.c
index 9d4ea7b..d33a1ff 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -72,7 +72,7 @@ void gtp_errpack(int pri, char *fn, int ln, struct sockaddr_in *peer,
   va_list args;
   char buf[ERRMSG_SIZE];
   char buf2[ERRMSG_SIZE];
-  int n;
+  unsigned int n;
   int pos;
   
   va_start(args, fmt);
@@ -177,7 +177,7 @@ extern int gtp_set_cb_data_ind(struct gsn_t *gsn,
  * to hold the packet header.
  * returns the length of the header. 0 on error.
  **/
-static int get_default_gtp(int version, uint8_t type, void *packet) {
+static unsigned int get_default_gtp(int version, uint8_t type, void *packet) {
   struct gtp0_header *gtp0_default = (struct gtp0_header*) packet;
   struct gtp1_header_long *gtp1_default = (struct gtp1_header_long*) packet;
   switch (version) {
@@ -286,7 +286,7 @@ static uint32_t get_tei(void *pack) {
 
 int print_packet(void *packet, unsigned len)
 {
-  int i;
+  unsigned int i;
   printf("The packet looks like this (%d bytes):\n", len);
   for( i=0; i<len; i++) {
     printf("%02x ", (unsigned char)*(char *)(packet+i));
@@ -298,7 +298,7 @@ int print_packet(void *packet, unsigned len)
 
 char* snprint_packet(struct gsn_t *gsn, struct sockaddr_in *peer,
 		     void *pack, unsigned len, char *buf, int size) {
-  int n;
+  unsigned int n;
   int pos;
   snprintf(buf, size, "Packet from %s:%u, length: %d, content:",
 	   inet_ntoa(peer->sin_addr),
@@ -867,7 +867,7 @@ int gtp_echo_req(struct gsn_t *gsn, int version, void *cbp,
 		 struct in_addr *inetaddr)
 {
   union gtp_packet packet;
-  int length = get_default_gtp(version, GTP_ECHO_REQ, &packet);
+  unsigned int length = get_default_gtp(version, GTP_ECHO_REQ, &packet);
   return gtp_req(gsn, version, NULL, &packet, length, inetaddr, cbp);
 }
 
@@ -877,7 +877,7 @@ int gtp_echo_resp(struct gsn_t *gsn, int version,
 		  void *pack, unsigned len)
 {
   union gtp_packet packet;
-  int length = get_default_gtp(version, GTP_ECHO_RSP, &packet);
+  unsigned int length = get_default_gtp(version, GTP_ECHO_RSP, &packet);
   gtpie_tv1(&packet, &length, GTP_MAX, GTPIE_RECOVERY, gsn->restart_counter);
   return gtp_resp(version, gsn, NULL, &packet, length, peer, fd, 
 		  get_seq(pack), get_tid(pack));
@@ -948,7 +948,7 @@ int gtp_unsup_req(struct gsn_t *gsn, int version, struct sockaddr_in *peer,
   union gtp_packet packet;
 
   /* GTP 1 is the highest supported protocol */
-  int length = get_default_gtp(1, GTP_NOT_SUPPORTED, &packet);
+  unsigned int length = get_default_gtp(1, GTP_NOT_SUPPORTED, &packet);
   return gtp_notification(gsn, version, &packet, length, 
 			  peer, fd, 0);
 }
@@ -967,7 +967,7 @@ int gtp_extheader_req(struct gsn_t *gsn, int version, struct sockaddr_in *peer,
 		      int fd, void *pack, unsigned len)
 {
   union gtp_packet packet;
-  int length = get_default_gtp(version, GTP_SUPP_EXT_HEADER, &packet);
+  unsigned int length = get_default_gtp(version, GTP_SUPP_EXT_HEADER, &packet);
 
   uint8_t pdcp_pdu = GTP_EXT_PDCP_PDU;
 
@@ -1008,7 +1008,7 @@ int gtp_extheader_ind(struct gsn_t *gsn, struct sockaddr_in *peer,
 extern int gtp_create_context_req(struct gsn_t *gsn, struct pdp_t *pdp, 
 				  void *cbp) {
   union gtp_packet packet;
-  int length = get_default_gtp(pdp->version, GTP_CREATE_PDP_REQ, &packet);
+  unsigned int length = get_default_gtp(pdp->version, GTP_CREATE_PDP_REQ, &packet);
   struct pdp_t *linked_pdp = NULL;
 
   /* TODO: Secondary PDP Context Activation Procedure */
@@ -1147,7 +1147,7 @@ int gtp_set_cb_create_context_ind(struct gsn_t *gsn,
 int gtp_create_pdp_resp(struct gsn_t *gsn, int version, struct pdp_t *pdp, 
 			uint8_t cause) {
   union gtp_packet packet;
-  int length = get_default_gtp(version, GTP_CREATE_PDP_RSP, &packet);
+  unsigned int length = get_default_gtp(version, GTP_CREATE_PDP_RSP, &packet);
 
   gtpie_tv1(&packet, &length, GTP_MAX, GTPIE_CAUSE, cause);
 
@@ -1726,7 +1726,7 @@ int gtp_create_pdp_conf(struct gsn_t *gsn, int version,
 int gtp_update_context(struct gsn_t *gsn, struct pdp_t *pdp, void *cbp,
 		       struct in_addr* inetaddr) {
   union gtp_packet packet;
-  int length = get_default_gtp(pdp->version, GTP_UPDATE_PDP_REQ, &packet);
+  unsigned int length = get_default_gtp(pdp->version, GTP_UPDATE_PDP_REQ, &packet);
   
   if (pdp->version == 0)
     gtpie_tv0(&packet, &length, GTP_MAX, GTPIE_QOS_PROFILE0, 
@@ -1805,7 +1805,7 @@ int gtp_update_pdp_resp(struct gsn_t *gsn, int version,
 			struct pdp_t *pdp, uint8_t cause) {
   
   union gtp_packet packet;
-  int length = get_default_gtp(version, GTP_CREATE_PDP_RSP, &packet);
+  unsigned int length = get_default_gtp(version, GTP_CREATE_PDP_RSP, &packet);
   
   gtpie_tv1(&packet, &length, GTP_MAX, GTPIE_CAUSE, cause);
   
@@ -2181,7 +2181,7 @@ int gtp_update_pdp_conf(struct gsn_t *gsn, int version,
 int gtp_delete_context_req(struct gsn_t *gsn, struct pdp_t *pdp, void *cbp,
 			   int teardown) {
   union gtp_packet packet;
-  int length = get_default_gtp(pdp->version, GTP_DELETE_PDP_REQ, &packet);
+  unsigned int length = get_default_gtp(pdp->version, GTP_DELETE_PDP_REQ, &packet);
   struct in_addr addr;
   struct pdp_t *linked_pdp;
   struct pdp_t *secondary_pdp;
@@ -2258,7 +2258,7 @@ int gtp_delete_pdp_resp(struct gsn_t *gsn, int version,
 {
   union gtp_packet packet;
   struct pdp_t *secondary_pdp;
-  int length = get_default_gtp(version, GTP_DELETE_PDP_RSP, &packet);
+  unsigned int length = get_default_gtp(version, GTP_DELETE_PDP_RSP, &packet);
   int n;
 
   gtpie_tv1(&packet, &length, GTP_MAX, GTPIE_CAUSE, cause);
@@ -2432,7 +2432,7 @@ int gtp_error_ind_resp(struct gsn_t *gsn, int version,
 		       void *pack, unsigned len)
 {
   union gtp_packet packet;
-  int length = get_default_gtp(version, GTP_ERROR, &packet);
+  unsigned int length = get_default_gtp(version, GTP_ERROR, &packet);
   
   return gtp_resp(version, gsn, NULL, &packet, length, peer, fd,
 		  get_seq(pack), get_tid(pack));
@@ -2524,7 +2524,7 @@ int gtp_decaps0(struct gsn_t *gsn)
 {
   unsigned char buffer[PACKET_MAX];
   struct sockaddr_in peer;
-  int peerlen;
+  size_t peerlen;
   int status;
   struct gtp0_header *pheader;
   int version = 0; /* GTP version should be determined from header!*/
@@ -2656,7 +2656,7 @@ int gtp_decaps1c(struct gsn_t *gsn)
 {
   unsigned char buffer[PACKET_MAX];
   struct sockaddr_in peer;
-  int peerlen;
+  size_t peerlen;
   int status;
   struct gtp1_header_short *pheader;
   int version = 1; /* TODO GTP version should be determined from header!*/
@@ -2815,7 +2815,7 @@ int gtp_decaps1u(struct gsn_t *gsn)
 {
   unsigned char buffer[PACKET_MAX];
   struct sockaddr_in peer;
-  int peerlen;
+  size_t peerlen;
   int status;
   struct gtp1_header_short *pheader;
   int version = 1; /* GTP version should be determined from header!*/
diff --git a/gtp/gtpie.c b/gtp/gtpie.c
index a62d02c..2bf6b07 100644
--- a/gtp/gtpie.c
+++ b/gtp/gtpie.c
@@ -39,7 +39,7 @@
 
 #include "gtpie.h"
 
-int gtpie_tlv(void *p, int *length, int size, uint8_t t, int l, void *v) {
+int gtpie_tlv(void *p, unsigned int *length, unsigned int size, uint8_t t, int l, void *v) {
   if ((*length + 3 + l) >= size) return 1;
   ((union gtpie_member*) (p + *length))->tlv.t = hton8(t);
   ((union gtpie_member*) (p + *length))->tlv.l = hton16(l);
@@ -48,7 +48,7 @@ int gtpie_tlv(void *p, int *length, int size, uint8_t t, int l, void *v) {
   return 0;
 }
 
-int gtpie_tv0(void *p, int *length, int size, uint8_t t, int l, uint8_t *v) {
+int gtpie_tv0(void *p, unsigned int *length, unsigned int size, uint8_t t, int l, uint8_t *v) {
   if ((*length + 1 + l) >= size) return 1;
   ((union gtpie_member*) (p + *length))->tv0.t = hton8(t);
   memcpy((void*) (p + *length +1), v, l);
@@ -56,7 +56,7 @@ int gtpie_tv0(void *p, int *length, int size, uint8_t t, int l, uint8_t *v) {
   return 0;
 }
 
-int gtpie_tv1(void *p, int *length, int size, uint8_t t, uint8_t v) {
+int gtpie_tv1(void *p, unsigned int *length, unsigned int size, uint8_t t, uint8_t v) {
   if ((*length + 2) >= size) return 1;
   ((union gtpie_member*) (p + *length))->tv1.t = hton8(t);
   ((union gtpie_member*) (p + *length))->tv1.v = hton8(v);
@@ -64,7 +64,7 @@ int gtpie_tv1(void *p, int *length, int size, uint8_t t, uint8_t v) {
   return 0;
 }
 
-int gtpie_tv2(void *p, int *length, int size, uint8_t t, uint16_t v) {
+int gtpie_tv2(void *p, unsigned int *length, unsigned int size, uint8_t t, uint16_t v) {
   if ((*length + 3) >= size) return 1;
   ((union gtpie_member*) (p + *length))->tv2.t = hton8(t);
   ((union gtpie_member*) (p + *length))->tv2.v = hton16(v);
@@ -72,7 +72,7 @@ int gtpie_tv2(void *p, int *length, int size, uint8_t t, uint16_t v) {
   return 0;
 }
 
-int gtpie_tv4(void *p, int *length, int size, uint8_t t, uint32_t v) {
+int gtpie_tv4(void *p, unsigned int *length, unsigned int size, uint8_t t, uint32_t v) {
   if ((*length + 5) >= size) return 1;
   ((union gtpie_member*) (p + *length))->tv4.t = hton8(t);
   ((union gtpie_member*) (p + *length))->tv4.v = hton32(v);
@@ -80,7 +80,7 @@ int gtpie_tv4(void *p, int *length, int size, uint8_t t, uint32_t v) {
   return 0;
 }
 
-int gtpie_tv8(void *p, int *length, int size, uint8_t t, uint64_t v) {
+int gtpie_tv8(void *p, unsigned int *length, unsigned int size, uint8_t t, uint64_t v) {
   if ((*length + 9) >= size) return 1;
   ((union gtpie_member*) (p + *length))->tv8.t = hton8(t);
   ((union gtpie_member*) (p + *length))->tv8.v = hton64(v);
@@ -109,7 +109,7 @@ int gtpie_exist(union gtpie_member* ie[], int type, int instance) {
 }
 
 int gtpie_gettlv(union gtpie_member* ie[], int type, int instance,
-		 int *length, void *dst, int size){
+		 unsigned int *length, void *dst, unsigned int size){
   int ien;
   ien = gtpie_getie(ie, type, instance);
   if (ien>=0) {
@@ -123,7 +123,7 @@ int gtpie_gettlv(union gtpie_member* ie[], int type, int instance,
 }
 
 int gtpie_gettv0(union gtpie_member* ie[], int type, int instance,
-		void *dst, int size){
+		void *dst, unsigned int size){
   int ien;
   ien = gtpie_getie(ie, type, instance);
   if (ien>=0)
@@ -453,9 +453,9 @@ int gtpie_encaps(union gtpie_member *ie[], void *pack, unsigned *len) {
   return 0;
 }
 
-int gtpie_encaps2(union gtpie_member ie[], int size,
+int gtpie_encaps2(union gtpie_member ie[], unsigned int size,
 		  void *pack, unsigned *len) {
-  int i, j;
+  unsigned int i, j;
   unsigned char *p;
   unsigned char *end;
   union gtpie_member *m;
diff --git a/gtp/gtpie.h b/gtp/gtpie.h
index 9c0e3ca..83886f5 100644
--- a/gtp/gtpie.h
+++ b/gtp/gtpie.h
@@ -219,20 +219,20 @@ struct tlv2 {
   uint16_t length;
 }__attribute__((packed));
 
-extern int gtpie_tlv(void *p, int *length, int size,
+extern int gtpie_tlv(void *p, unsigned int *length, unsigned int size,
 		     uint8_t t, int l, void *v);
-extern int gtpie_tv0(void *p, int *length, int size, 
+extern int gtpie_tv0(void *p, unsigned int *length, unsigned int size, 
 		     uint8_t t, int l, uint8_t *v);
-extern int gtpie_tv1(void *p, int *length, int size, uint8_t t, uint8_t v);
-extern int gtpie_tv2(void *p, int *length, int size, uint8_t t, uint16_t v);
-extern int gtpie_tv4(void *p, int *length, int size, uint8_t t, uint32_t v);
-extern int gtpie_tv8(void *p, int *length, int size, uint8_t t, uint64_t v);
+extern int gtpie_tv1(void *p, unsigned int *length, unsigned int size, uint8_t t, uint8_t v);
+extern int gtpie_tv2(void *p, unsigned int *length, unsigned int size, uint8_t t, uint16_t v);
+extern int gtpie_tv4(void *p, unsigned int *length, unsigned int size, uint8_t t, uint32_t v);
+extern int gtpie_tv8(void *p, unsigned int *length, unsigned int size, uint8_t t, uint64_t v);
 extern int gtpie_getie(union gtpie_member* ie[], int type, int instance);
 extern int gtpie_exist(union gtpie_member* ie[], int type, int instance);
 extern int gtpie_gettlv(union gtpie_member* ie[], int type, int instance,
-			int *length, void *dst, int size);
+			unsigned int *length, void *dst, unsigned int size);
 extern int gtpie_gettv0(union gtpie_member* ie[], int type, int instance,
-			void *dst, int size);
+			void *dst, unsigned int size);
 extern int gtpie_gettv1(union gtpie_member* ie[], int type, int instance, 
 			uint8_t *dst);
 extern int gtpie_gettv2(union gtpie_member* ie[], int type, int instance, 
@@ -245,7 +245,7 @@ extern int gtpie_gettv8(union gtpie_member* ie[], int type, int instance,
 extern int gtpie_decaps(union gtpie_member* ie[], int version,
 			void *pack, unsigned len);
 extern int gtpie_encaps(union gtpie_member* ie[], void *pack, unsigned *len);
-extern int gtpie_encaps2(union gtpie_member ie[], int size,
+extern int gtpie_encaps2(union gtpie_member ie[], unsigned int size,
 		  void *pack, unsigned *len);
 
 
diff --git a/gtp/pdp.h b/gtp/pdp.h
index 59541c6..13ae280 100644
--- a/gtp/pdp.h
+++ b/gtp/pdp.h
@@ -23,27 +23,27 @@
 
 
 struct sl_t {
-int l;
+unsigned int l;
 char *v;
 };
 
 struct ul_t {
-int l;
+unsigned int l;
 unsigned char *v;
 };
 
 struct ul16_t {
-int l;
+unsigned int l;
 unsigned char v[16];
 };
 
 struct ul66_t {
-int l;
+unsigned int l;
 unsigned char v[66];
 };
 
 struct ul255_t {
-int l;
+unsigned int l;
 unsigned char v[255];
 };