diff options
author | Harald Welte <laforge@gnumonks.org> | 2017-09-24 17:45:05 +0800 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2017-10-01 18:19:07 +0800 |
commit | cee7546f15bc66443c17a0b2cbca2570d85e3517 (patch) | |
tree | 5a00ac0a658d6ec3f0e674771a86bf146ba09808 /gtp | |
parent | ed1ba2c902624a1bc97d73bc29e64f3fab8658ac (diff) |
Replace EUA magic numbers for IETF, IPv4 and IPv6 with #defines
Change-Id: I33f65e404217e717bd795e5229c8d9456a7b3739
Diffstat (limited to 'gtp')
-rw-r--r-- | gtp/gtp.c | 6 | ||||
-rw-r--r-- | gtp/pdp.c | 6 | ||||
-rw-r--r-- | gtp/pdp.h | 4 |
3 files changed, 10 insertions, 6 deletions
@@ -3259,8 +3259,8 @@ int char2ul_t(char *src, struct ul_t dst) int ipv42eua(struct ul66_t *eua, struct in_addr *src) { - eua->v[0] = 0xf1; /* IETF */ - eua->v[1] = 0x21; /* IPv4 */ + eua->v[0] = PDP_EUA_ORG_IETF; + eua->v[1] = PDP_EUA_TYPE_v4; if (src) { eua->l = 6; memcpy(&eua->v[2], src, 4); @@ -3272,7 +3272,7 @@ int ipv42eua(struct ul66_t *eua, struct in_addr *src) int eua2ipv4(struct in_addr *dst, struct ul66_t *eua) { - if ((eua->l != 6) || (eua->v[0] != 0xf1) || (eua->v[1] = 0x21)) + if ((eua->l != 6) || (eua->v[0] != PDP_EUA_ORG_IETF) || (eua->v[1] != PDP_EUA_TYPE_v4)) return -1; /* Not IPv4 address */ memcpy(dst, &eua->v[2], 4); return 0; @@ -367,15 +367,15 @@ int pdp_ipget(struct pdp_t **pdp, void* ipif, struct ul66_t *eua) { int pdp_ntoeua(struct in_addr *src, struct ul66_t *eua) { eua->l = 6; - eua->v[0] = 0xf1; /* IETF */ - eua->v[1] = 0x21; /* IPv4 */ + eua->v[0] = PDP_EUA_ORG_IETF; + eua->v[1] = PDP_EUA_TYPE_v4; memcpy(&eua->v[2], src, 4); /* Copy a 4 byte address */ return 0; } int pdp_euaton(struct ul66_t *eua, struct in_addr *dst) { - if ((eua->l != 6) || (eua->v[0] != 0xf1) || (eua->v[1] != 0x21)) { + if ((eua->l != 6) || (eua->v[0] != PDP_EUA_ORG_IETF) || (eua->v[1] != PDP_EUA_TYPE_v4)) { return EOF; } memcpy(dst, &eua->v[2], 4); /* Copy a 4 byte address */ @@ -23,6 +23,10 @@ struct gsn_t; #define PDP_MAX 1024 /* Max number of PDP contexts */ #define PDP_MAXNSAPI 16 /* Max number of NSAPI */ +#define PDP_EUA_ORG_IETF 0xF1 +#define PDP_EUA_TYPE_v4 0x21 +#define PDP_EUA_TYPE_v6 0x57 + /* GTP Information elements from 29.060 v3.9.0 7.7 Information Elements */ /* Also covers version 0. Note that version 0 6: QOS Profile was superceded * * by 135: QOS Profile in version 1 */ |