cellular-infrastructure
/
openggsn
Archived
9
0
Fork 0
Code Releases Activity

gtp: add pdp_set_imsi_nsapi 

Encapsulate code to handle the teid with GTPv0.
This commit is contained in:
Pablo Neira Ayuso 2014-03-24 17:58:27 +01:00
parent 9c0ff4fafe
commit 746b944ad6
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtp/gtp.c
View File

@ -427,8 +427,7 @@ int gtp_req(struct gsn_t *gsn, int version, struct pdp_t *pdp,
packet->gtp0.h.seq = hton16(gsn->seq_next);
if (pdp) {
packet->gtp0.h.tid =
htobe64((pdp->imsi & 0x0fffffffffffffffull) +
((uint64_t) pdp->nsapi << 60));
htobe64(pdp_gettid(pdp->imsi, pdp->nsapi));
}
if (pdp && ((packet->gtp0.h.type == GTP_GPDU)
|| (packet->gtp0.h.type == GTP_ERROR)))
@ -1332,8 +1331,7 @@ int gtp_create_pdp_ind(struct gsn_t *gsn, int version,
if (version == 0) {
uint64_t tid = be64toh(((union gtp_packet *)pack)->gtp0.h.tid);
pdp->imsi = tid & 0x0fffffffffffffffull;
pdp->nsapi = (tid & 0xf000000000000000ull) >> 60;
pdp_set_imsi_nsapi(pdp, tid);
}
pdp->seq = seq;
@ -2052,8 +2050,7 @@ int gtp_update_pdp_ind(struct gsn_t *gsn, int version,
if (version == 0) {
uint64_t tid = be64toh(((union gtp_packet *)pack)->gtp0.h.tid);
imsi = tid & 0x0fffffffffffffffull;
nsapi = (tid & 0xf000000000000000ull) >> 60;
pdp_set_imsi_nsapi(pdp, tid);
/* Find the context in question */
if (pdp_getimsi(&pdp, imsi, nsapi)) {
@ -3193,9 +3190,7 @@ int gtp_data_req(struct gsn_t *gsn, struct pdp_t *pdp, void *pack, unsigned len)
packet.gtp0.h.length = hton16(len);
packet.gtp0.h.seq = hton16(pdp->gtpsntx++);
packet.gtp0.h.flow = hton16(pdp->flru);
packet.gtp0.h.tid =
htobe64((pdp->imsi & 0x0fffffffffffffffull) +
((uint64_t) pdp->nsapi << 60));
packet.gtp0.h.tid = htobe64(pdp_gettid(pdp->imsi, pdp->nsapi));
if (len > sizeof(union gtp_packet) - sizeof(struct gtp0_header)) {
gsn->err_memcpy++;

6
gtp/pdp.c
View File

@ -370,6 +370,12 @@ uint64_t pdp_gettid(uint64_t imsi, uint8_t nsapi)
return (imsi & 0x0fffffffffffffffull) + ((uint64_t) nsapi << 60);
}
void pdp_set_imsi_nsapi(struct pdp_t *pdp, uint64_t teid)
{
pdp->imsi = teid & 0x0fffffffffffffffull;
pdp->nsapi = (teid & 0xf000000000000000ull) >> 60;
}
int ulcpy(void *dst, void *src, size_t size)
{
if (((struct ul255_t *)src)->l <= size) {

2
gtp/pdp.h
View File

@ -242,6 +242,8 @@ int pdp_tidset(struct pdp_t *pdp, uint64_t tid);
int pdp_tiddel(struct pdp_t *pdp);
int pdp_tidget(struct pdp_t **pdp, uint64_t tid);
void pdp_set_imsi_nsapi(struct pdp_t *pdp, uint64_t teid);
/*
int pdp_iphash(void* ipif, struct ul66_t *eua);
int pdp_ipset(struct pdp_t *pdp, void* ipif, struct ul66_t *eua);