Added --net, --nsapi, --gtpversion options
diff --git a/gtp/gtp.c b/gtp/gtp.c
index 7c4a72f..0de69a4 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -996,7 +996,7 @@
 
 /* API: Send Create PDP Context Request */
 extern int gtp_create_context_req(struct gsn_t *gsn, struct pdp_t *pdp, 
-				  void *cbp, struct in_addr* inetaddr) {
+				  void *cbp) {
   union gtp_packet packet;
   int length = get_default_gtp(pdp->version, GTP_CREATE_PDP_REQ, &packet);
   struct pdp_t *linked_pdp = NULL;
@@ -1107,7 +1107,8 @@
     gtpie_tlv(&packet, &length, GTP_MAX, GTPIE_OMC_ID,
 	      pdp->omcid.l, pdp->omcid.v);
   
-  gtp_req(gsn, pdp->version, pdp, &packet, length, inetaddr, cbp);
+  /* TODO hisaddr0 */
+  gtp_req(gsn, pdp->version, pdp, &packet, length, &pdp->hisaddr0, cbp);
 
   return 0;
 }
diff --git a/gtp/gtp.h b/gtp/gtp.h
index ebe869e..d1f0e22 100644
--- a/gtp/gtp.h
+++ b/gtp/gtp.h
@@ -305,7 +305,7 @@
 extern int gtp_freepdp(struct gsn_t *gsn, struct pdp_t *pdp);
 
 extern int gtp_create_context_req(struct gsn_t *gsn, struct pdp_t *pdp, 
-				  void *cbp, struct in_addr* inetaddr);
+				  void *cbp);
 
 extern int gtp_set_cb_create_context_ind(struct gsn_t *gsn,
 	     int (*cb_create_context_ind) (struct pdp_t* pdp));
diff --git a/gtp/pdp.h b/gtp/pdp.h
index 4ef63b3..62175ef 100644
--- a/gtp/pdp.h
+++ b/gtp/pdp.h
@@ -212,6 +212,12 @@
 
   /* Secondary contexts of this primary context */
   uint32_t secondary_tei[PDP_MAXNSAPI]; 
+
+  /* IP address used for Create and Update PDP Context Requests */
+  struct in_addr hisaddr0;       /* Server address */
+  struct in_addr hisaddr1;       /* Server address */
+
+
 };
 
 
diff --git a/gtp/queue.h b/gtp/queue.h
index 1e226c9..5169598 100644
--- a/gtp/queue.h
+++ b/gtp/queue.h
@@ -24,7 +24,7 @@
 
 #define QUEUE_DEBUG 0    /* Print debug information */
 
-#define QUEUE_SIZE 256 /* Size of retransmission queue */
+#define QUEUE_SIZE 1024  /* Size of retransmission queue */
 #define QUEUE_HASH_SIZE 65536 /* Size of hash table (2^16) */
 
 struct qmsg_t {           /* Holder for queued packets */