Skip to content

Commit b64e9a1

Browse files
committed
switch: fix missing recovery IE update
Recovery IE originated from GTP-Guard in proxy mode MUST use local GTP-Guard restart_counter.
1 parent 703cfcf commit b64e9a1

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

src/gtp_switch_hdl_v1.c

+15
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,9 @@ gtp1_create_pdp_response_hdl(gtp_server_worker_t *w, struct sockaddr_storage *ad
355355
return NULL;
356356
}
357357

358+
/* Recovery xlat */
359+
gtp1_session_xlat_recovery(w);
360+
358361
/* SQN masq */
359362
gtp_sqn_restore(w, t);
360363

@@ -548,6 +551,9 @@ gtp1_update_pdp_response_hdl(gtp_server_worker_t *w, struct sockaddr_storage *ad
548551
return NULL;
549552
}
550553

554+
/* Recovery xlat */
555+
gtp1_session_xlat_recovery(w);
556+
551557
/* SQN masq */
552558
gtp_sqn_restore(w, teid->peer_teid);
553559

@@ -631,6 +637,9 @@ gtp1_delete_pdp_request_hdl(gtp_server_worker_t *w, struct sockaddr_storage *add
631637
/* Set GGSN TEID */
632638
h->teid = teid->id;
633639

640+
/* Recovery xlat */
641+
gtp1_session_xlat_recovery(w);
642+
634643
/* Update SQN */
635644
gtp_sqn_update(w, teid);
636645
gtp_vsqn_alloc(w, teid, false);
@@ -672,6 +681,9 @@ gtp1_delete_pdp_response_hdl(gtp_server_worker_t *w, struct sockaddr_storage *ad
672681
return NULL;
673682
}
674683

684+
/* Recovery xlat */
685+
gtp1_session_xlat_recovery(w);
686+
675687
/* SQN masq */
676688
gtp_sqn_restore(w, teid);
677689

@@ -684,6 +696,9 @@ gtp1_delete_pdp_response_hdl(gtp_server_worker_t *w, struct sockaddr_storage *ad
684696
/* Restore TEID at SGSN */
685697
h->teid = teid->id;
686698

699+
/* Recovery xlat */
700+
gtp1_session_xlat_recovery(w);
701+
687702
/* SQN masq */
688703
gtp_sqn_restore(w, teid->peer_teid);
689704

src/gtp_switch_hdl_v2.c

+15
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,9 @@ gtpc_create_session_response_hdl(gtp_server_worker_t *w, struct sockaddr_storage
392392
gtp_ie_imsi_rewrite(t->session->apn, cp);
393393
}
394394

395+
/* Recovery xlat */
396+
gtpc_session_xlat_recovery(w);
397+
395398
/* SQN masq */
396399
gtp_sqn_restore(w, t);
397400

@@ -538,6 +541,9 @@ gtpc_delete_session_response_hdl(gtp_server_worker_t *w, struct sockaddr_storage
538541
gtp_ie_imsi_rewrite(teid->session->apn, cp);
539542
}
540543

544+
/* Recovery xlat */
545+
gtpc_session_xlat_recovery(w);
546+
541547
/* SQN masq */
542548
gtp_sqn_restore(w, teid->peer_teid);
543549

@@ -556,6 +562,9 @@ gtpc_delete_session_response_hdl(gtp_server_worker_t *w, struct sockaddr_storage
556562
/* Set sGW TEID */
557563
h->teid = teid->id;
558564

565+
/* Recovery xlat */
566+
gtpc_session_xlat_recovery(w);
567+
559568
/* SQN masq */
560569
gtp_sqn_restore(w, teid->peer_teid);
561570

@@ -682,6 +691,9 @@ gtpc_modify_bearer_response_hdl(gtp_server_worker_t *w, struct sockaddr_storage
682691
gtp_ie_imsi_rewrite(teid->session->apn, cp);
683692
}
684693

694+
/* Recovery xlat */
695+
gtpc_session_xlat_recovery(w);
696+
685697
/* SQN masq */
686698
gtp_sqn_restore(w, teid->peer_teid);
687699

@@ -767,6 +779,9 @@ gtpc_delete_bearer_request_hdl(gtp_server_worker_t *w, struct sockaddr_storage *
767779
gtp_ie_imsi_rewrite(teid->session->apn, cp);
768780
}
769781

782+
/* Recovery xlat */
783+
gtpc_session_xlat_recovery(w);
784+
770785
/* Update SQN */
771786
gtp_sqn_update(w, teid);
772787
gtp_vsqn_alloc(w, teid, false);

0 commit comments

Comments
 (0)