Fixed sgsnemu freepdp on failed create context.

1 files changed, 34 insertions, 34 deletions

diff --git a/gtp/gtp.c b/gtp/gtp.c
index 7ec08b2..7c4a72f 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -1554,8 +1554,8 @@ int gtp_create_pdp_conf(struct gsn_t *gsn, int version,
     gtp_errpack(LOG_ERR, __FILE__, __LINE__, peer, pack, len,
 		"Invalid message format");
     if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp);
-    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-    pdp_freepdp(pdp);
+    /*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	  pdp_freepdp(pdp); */
     return EOF;
   }
 
@@ -1565,8 +1565,8 @@ int gtp_create_pdp_conf(struct gsn_t *gsn, int version,
     gtp_errpack(LOG_ERR, __FILE__, __LINE__, peer, pack, len,
 		"Missing mandatory information field");
     if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp);
-    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-    pdp_freepdp(pdp);
+    /*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	  pdp_freepdp(pdp); */
     return EOF;
   }
 
@@ -1590,8 +1590,8 @@ int gtp_create_pdp_conf(struct gsn_t *gsn, int version,
 	gtp_errpack(LOG_ERR, __FILE__, __LINE__, peer, pack, len,
 		    "Missing conditional information field");
 	if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp);
-	if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-	pdp_freepdp(pdp);
+	/*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	      pdp_freepdp(pdp); */
 	return EOF;
       }
     }
@@ -1600,9 +1600,9 @@ int gtp_create_pdp_conf(struct gsn_t *gsn, int version,
       gsn->missing++;
       gtp_errpack(LOG_ERR, __FILE__, __LINE__, peer, pack, len,
 		  "Missing conditional information field");
-      if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-      pdp_freepdp(pdp);
       if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp);
+	/*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	      pdp_freepdp(pdp); */
       return EOF;
     }
 
@@ -1612,8 +1612,8 @@ int gtp_create_pdp_conf(struct gsn_t *gsn, int version,
 	gtp_errpack(LOG_ERR, __FILE__, __LINE__, peer, pack, len,
 		    "Missing conditional information field");
 	if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp);
-	if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-	pdp_freepdp(pdp);
+	/*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	      pdp_freepdp(pdp); */
 	return EOF;
       }
     
@@ -1622,8 +1622,8 @@ int gtp_create_pdp_conf(struct gsn_t *gsn, int version,
 	gtp_errpack(LOG_ERR, __FILE__, __LINE__, peer, pack, len,
 		    "Missing conditional information field");
 	if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp);
-	if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-	pdp_freepdp(pdp);
+	/*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	      pdp_freepdp(pdp); */
 	return EOF;
       }
     }
@@ -1634,8 +1634,8 @@ int gtp_create_pdp_conf(struct gsn_t *gsn, int version,
 	gtp_errpack(LOG_ERR, __FILE__, __LINE__, peer, pack, len,
 		    "Missing conditional information field");
 	if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp);
-	if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-	pdp_freepdp(pdp);
+	/*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	      pdp_freepdp(pdp); */
 	return EOF;
       }
     
@@ -1644,8 +1644,8 @@ int gtp_create_pdp_conf(struct gsn_t *gsn, int version,
 	gtp_errpack(LOG_ERR, __FILE__, __LINE__, peer, pack, len,
 		    "Missing conditional information field");
 	if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp);
-	if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-	pdp_freepdp(pdp);
+	/*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	      pdp_freepdp(pdp); */
 	return EOF;
       }
     }
@@ -1655,8 +1655,8 @@ int gtp_create_pdp_conf(struct gsn_t *gsn, int version,
       gtp_errpack(LOG_ERR, __FILE__, __LINE__, peer, pack, len,
 		  "Missing conditional information field");
       if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp);
-      if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-      pdp_freepdp(pdp);
+	/*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	      pdp_freepdp(pdp); */
     }
     
     if (gtpie_gettlv(ie, GTPIE_EUA, 0, &pdp->eua.l,
@@ -1665,8 +1665,8 @@ int gtp_create_pdp_conf(struct gsn_t *gsn, int version,
       gtp_errpack(LOG_ERR, __FILE__, __LINE__, peer, pack, len,
 		  "Missing conditional information field");
       if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp);
-      if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-      pdp_freepdp(pdp);
+      /*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	    pdp_freepdp(pdp); */
       return EOF;
     }
     
@@ -1676,8 +1676,8 @@ int gtp_create_pdp_conf(struct gsn_t *gsn, int version,
       gtp_errpack(LOG_ERR, __FILE__, __LINE__, peer, pack, len,
 		  "Missing conditional information field");
       if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp);
-      if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-      pdp_freepdp(pdp);
+      /*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	    pdp_freepdp(pdp); */
       return EOF;
     }
     
@@ -1687,8 +1687,8 @@ int gtp_create_pdp_conf(struct gsn_t *gsn, int version,
       gtp_errpack(LOG_ERR, __FILE__, __LINE__, peer, pack, len,
 		  "Missing conditional information field");
       if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp);
-      if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-      pdp_freepdp(pdp);
+      /*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	    pdp_freepdp(pdp); */
       return EOF;
     }
 
@@ -1699,8 +1699,8 @@ int gtp_create_pdp_conf(struct gsn_t *gsn, int version,
 	gtp_errpack(LOG_ERR, __FILE__, __LINE__, peer, pack, len,
 		    "Missing conditional information field");
 	if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp);
-	if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-	pdp_freepdp(pdp);
+	/*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	      pdp_freepdp(pdp); */
 	return EOF;
       }
     }
@@ -2101,8 +2101,8 @@ int gtp_update_pdp_conf(struct gsn_t *gsn, int version,
     gtp_errpack(LOG_ERR, __FILE__, __LINE__, peer, pack, len,
 		"Invalid message format");
     if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp);
-    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-    pdp_freepdp(pdp);
+    /*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	  pdp_freepdp(pdp); */
     return EOF;
   }
       
@@ -2112,8 +2112,8 @@ int gtp_update_pdp_conf(struct gsn_t *gsn, int version,
     gtp_errpack(LOG_ERR, __FILE__, __LINE__, peer, pack, len,
 		"Missing mandatory information field");
     if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp);
-    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-    pdp_freepdp(pdp);
+    /*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	  pdp_freepdp(pdp); */
     return EOF;
   }
 
@@ -2125,8 +2125,8 @@ int gtp_update_pdp_conf(struct gsn_t *gsn, int version,
   /* Check all conditional information elements */
   if (GTPCAUSE_ACC_REQ != cause) {
     if (gsn->cb_conf) gsn->cb_conf(type, cause, pdp, cbp);
-    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-    pdp_freepdp(pdp);
+    /*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	  pdp_freepdp(pdp); */
     return 0;
   }
   else {
@@ -2143,8 +2143,8 @@ int gtp_update_pdp_conf(struct gsn_t *gsn, int version,
       gtp_errpack(LOG_ERR, __FILE__, __LINE__, peer, pack, len,
 		  "Missing conditional information field");
       if (gsn->cb_conf) gsn->cb_conf(type, EOF, pdp, cbp);
-      if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
-      pdp_freepdp(pdp);
+      /*    if (gsn->cb_delete_context) gsn->cb_delete_context(pdp);
+	    pdp_freepdp(pdp); */
       return EOF;
     }