Convert all code to Linux coding style
After so many years of silence, we don't expect the original author to
return to the project. To make things a bit simpler for us, we convert
the coding style to what we are used to (Linux style).
The conversion was made using the 'Lindent' script which is part of the
Linux kernel.
diff --git a/gtp/gtpie.h b/gtp/gtpie.h
index b8fe1e7..340a76c 100644
--- a/gtp/gtpie.h
+++ b/gtp/gtpie.h
@@ -21,14 +21,13 @@
#define ntoh32(x) ntohl(x)
#if BYTE_ORDER == LITTLE_ENDIAN
-static __inline uint64_t
-hton64(uint64_t q)
+static __inline uint64_t hton64(uint64_t q)
{
- register uint32_t u, l;
- u = q >> 32;
- l = (uint32_t) q;
+ register uint32_t u, l;
+ u = q >> 32;
+ l = (uint32_t) q;
- return htonl(u) | ((uint64_t)htonl(l) << 32);
+ return htonl(u) | ((uint64_t) htonl(l) << 32);
}
#define ntoh64(_x) hton64(_x)
@@ -42,127 +41,124 @@
#error "Please fix <machine/endian.h>"
#endif
+#define GTPIE_SIZE 256 /* Max number of information elements */
+#define GTPIE_MAX 0xffff /* Max length of information elements */
+#define GTPIE_MAX_TV 28 /* Max length of type value pair */
+#define GTPIE_MAX_TLV 0xffff-3 /* Max length of TLV (GTP length is 16 bit) */
-#define GTPIE_SIZE 256 /* Max number of information elements */
-#define GTPIE_MAX 0xffff /* Max length of information elements */
-#define GTPIE_MAX_TV 28 /* Max length of type value pair */
-#define GTPIE_MAX_TLV 0xffff-3 /* Max length of TLV (GTP length is 16 bit) */
-
-#define GTPIE_DEBUG 0 /* Print debug information */
+#define GTPIE_DEBUG 0 /* Print debug information */
/* 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 */
-#define GTPIE_CAUSE 1 /* Cause 1 */
-#define GTPIE_IMSI 2 /* International Mobile Subscriber Identity 8 */
-#define GTPIE_RAI 3 /* Routing Area Identity (RAI) 8 */
-#define GTPIE_TLLI 4 /* Temporary Logical Link Identity (TLLI) 4 */
-#define GTPIE_P_TMSI 5 /* Packet TMSI (P-TMSI) 4 */
-#define GTPIE_QOS_PROFILE0 6 /* Quality of Service Profile GTP version 0 3*/
- /* 6-7 SPARE */ /* 6 is QoS Profile vers 0 */
-#define GTPIE_REORDER 8 /* Reordering Required 1 */
-#define GTPIE_AUTH_TRIPLET 9 /* Authentication Triplet 28 */
- /* 10 SPARE */
-#define GTPIE_MAP_CAUSE 11 /* MAP Cause 1 */
-#define GTPIE_P_TMSI_S 12 /* P-TMSI Signature 3 */
-#define GTPIE_MS_VALIDATED 13 /* MS Validated 1 */
-#define GTPIE_RECOVERY 14 /* Recovery 1 */
-#define GTPIE_SELECTION_MODE 15 /* Selection Mode 1 */
-#define GTPIE_FL_DI 16 /* Flow Label Data I 2 */
-#define GTPIE_TEI_DI 16 /* Tunnel Endpoint Identifier Data I 4 */
-#define GTPIE_TEI_C 17 /* Tunnel Endpoint Identifier Control Plane 4 */
-#define GTPIE_FL_C 17 /* Flow Label Signalling 2 */
-#define GTPIE_TEI_DII 18 /* Tunnel Endpoint Identifier Data II 5 */
-#define GTPIE_TEARDOWN 19 /* Teardown Ind 1 */
-#define GTPIE_NSAPI 20 /* NSAPI 1 */
-#define GTPIE_RANAP_CAUSE 21 /* RANAP Cause 1 */
-#define GTPIE_RAB_CONTEXT 22 /* RAB Context 7 */
-#define GTPIE_RP_SMS 23 /* Radio Priority SMS 1 */
-#define GTPIE_RP 24 /* Radio Priority 1 */
-#define GTPIE_PFI 25 /* Packet Flow Id 2 */
-#define GTPIE_CHARGING_C 26 /* Charging Characteristics 2 */
-#define GTPIE_TRACE_REF 27 /* Trace Reference 2 */
-#define GTPIE_TRACE_TYPE 28 /* Trace Type 2 */
-#define GTPIE_MS_NOT_REACH 29 /* MS Not Reachable Reason 1 */
- /* 30-116 UNUSED */
+#define GTPIE_CAUSE 1 /* Cause 1 */
+#define GTPIE_IMSI 2 /* International Mobile Subscriber Identity 8 */
+#define GTPIE_RAI 3 /* Routing Area Identity (RAI) 8 */
+#define GTPIE_TLLI 4 /* Temporary Logical Link Identity (TLLI) 4 */
+#define GTPIE_P_TMSI 5 /* Packet TMSI (P-TMSI) 4 */
+#define GTPIE_QOS_PROFILE0 6 /* Quality of Service Profile GTP version 0 3 */
+ /* 6-7 SPARE *//* 6 is QoS Profile vers 0 */
+#define GTPIE_REORDER 8 /* Reordering Required 1 */
+#define GTPIE_AUTH_TRIPLET 9 /* Authentication Triplet 28 */
+ /* 10 SPARE */
+#define GTPIE_MAP_CAUSE 11 /* MAP Cause 1 */
+#define GTPIE_P_TMSI_S 12 /* P-TMSI Signature 3 */
+#define GTPIE_MS_VALIDATED 13 /* MS Validated 1 */
+#define GTPIE_RECOVERY 14 /* Recovery 1 */
+#define GTPIE_SELECTION_MODE 15 /* Selection Mode 1 */
+#define GTPIE_FL_DI 16 /* Flow Label Data I 2 */
+#define GTPIE_TEI_DI 16 /* Tunnel Endpoint Identifier Data I 4 */
+#define GTPIE_TEI_C 17 /* Tunnel Endpoint Identifier Control Plane 4 */
+#define GTPIE_FL_C 17 /* Flow Label Signalling 2 */
+#define GTPIE_TEI_DII 18 /* Tunnel Endpoint Identifier Data II 5 */
+#define GTPIE_TEARDOWN 19 /* Teardown Ind 1 */
+#define GTPIE_NSAPI 20 /* NSAPI 1 */
+#define GTPIE_RANAP_CAUSE 21 /* RANAP Cause 1 */
+#define GTPIE_RAB_CONTEXT 22 /* RAB Context 7 */
+#define GTPIE_RP_SMS 23 /* Radio Priority SMS 1 */
+#define GTPIE_RP 24 /* Radio Priority 1 */
+#define GTPIE_PFI 25 /* Packet Flow Id 2 */
+#define GTPIE_CHARGING_C 26 /* Charging Characteristics 2 */
+#define GTPIE_TRACE_REF 27 /* Trace Reference 2 */
+#define GTPIE_TRACE_TYPE 28 /* Trace Type 2 */
+#define GTPIE_MS_NOT_REACH 29 /* MS Not Reachable Reason 1 */
+ /* 30-116 UNUSED */
/* 117-126 Reserved for the GPRS charging protocol (see GTP' in GSM 12.15) */
-#define GTPIE_CHARGING_ID 127 /* Charging ID 4 */
-#define GTPIE_EUA 128 /* End User Address */
-#define GTPIE_MM_CONTEXT 129 /* MM Context */
-#define GTPIE_PDP_CONTEXT 130 /* PDP Context */
-#define GTPIE_APN 131 /* Access Point Name */
-#define GTPIE_PCO 132 /* Protocol Configuration Options */
-#define GTPIE_GSN_ADDR 133 /* GSN Address */
-#define GTPIE_MSISDN 134 /* MS International PSTN/ISDN Number */
-#define GTPIE_QOS_PROFILE 135 /* Quality of Service Profile */
-#define GTPIE_AUTH_QUINTUP 136 /* Authentication Quintuplet */
-#define GTPIE_TFT 137 /* Traffic Flow Template */
-#define GTPIE_TARGET_INF 138 /* Target Identification */
-#define GTPIE_UTRAN_TRANS 139 /* UTRAN Transparent Container */
-#define GTPIE_RAB_SETUP 140 /* RAB Setup Information */
-#define GTPIE_EXT_HEADER_T 141 /* Extension Header Type List */
-#define GTPIE_TRIGGER_ID 142 /* Trigger Id */
-#define GTPIE_OMC_ID 143 /* OMC Identity */
-#define GTPIE_RAT_TYPE 151 /* Radio Access Technology Type */
-#define GTPIE_USER_LOC 152 /* User Location Information */
-#define GTPIE_MS_TZ 153 /* MS Time Zone */
-#define GTPIE_IMEI_SV 154 /* IMEI Software Version */
+#define GTPIE_CHARGING_ID 127 /* Charging ID 4 */
+#define GTPIE_EUA 128 /* End User Address */
+#define GTPIE_MM_CONTEXT 129 /* MM Context */
+#define GTPIE_PDP_CONTEXT 130 /* PDP Context */
+#define GTPIE_APN 131 /* Access Point Name */
+#define GTPIE_PCO 132 /* Protocol Configuration Options */
+#define GTPIE_GSN_ADDR 133 /* GSN Address */
+#define GTPIE_MSISDN 134 /* MS International PSTN/ISDN Number */
+#define GTPIE_QOS_PROFILE 135 /* Quality of Service Profile */
+#define GTPIE_AUTH_QUINTUP 136 /* Authentication Quintuplet */
+#define GTPIE_TFT 137 /* Traffic Flow Template */
+#define GTPIE_TARGET_INF 138 /* Target Identification */
+#define GTPIE_UTRAN_TRANS 139 /* UTRAN Transparent Container */
+#define GTPIE_RAB_SETUP 140 /* RAB Setup Information */
+#define GTPIE_EXT_HEADER_T 141 /* Extension Header Type List */
+#define GTPIE_TRIGGER_ID 142 /* Trigger Id */
+#define GTPIE_OMC_ID 143 /* OMC Identity */
+#define GTPIE_RAT_TYPE 151 /* Radio Access Technology Type */
+#define GTPIE_USER_LOC 152 /* User Location Information */
+#define GTPIE_MS_TZ 153 /* MS Time Zone */
+#define GTPIE_IMEI_SV 154 /* IMEI Software Version */
/* 239-250 Reserved for the GPRS charging protocol (see GTP' in GSM 12.15) */
-#define GTPIE_CHARGING_ADDR 251 /* Charging Gateway Address */
+#define GTPIE_CHARGING_ADDR 251 /* Charging Gateway Address */
/* 252-254 Reserved for the GPRS charging protocol (see GTP' in GSM 12.15) */
-#define GTPIE_PRIVATE 255 /* Private Extension */
-
+#define GTPIE_PRIVATE 255 /* Private Extension */
/* GTP information element structs in network order */
-struct gtpie_ext { /* Extension header */
- uint8_t t; /* Type */
- uint8_t l; /* Length */
- uint8_t *p; /* Value */
-} __attribute__((packed));
+struct gtpie_ext { /* Extension header */
+ uint8_t t; /* Type */
+ uint8_t l; /* Length */
+ uint8_t *p; /* Value */
+} __attribute__ ((packed));
-struct gtpie_tlv { /* Type length value pair */
- uint8_t t; /* Type */
- uint16_t l; /* Length */
- uint8_t v[GTPIE_MAX_TLV]; /* Value */
-} __attribute__((packed));
+struct gtpie_tlv { /* Type length value pair */
+ uint8_t t; /* Type */
+ uint16_t l; /* Length */
+ uint8_t v[GTPIE_MAX_TLV]; /* Value */
+} __attribute__ ((packed));
-struct gtpie_tv0 { /* 1 byte type value pair */
- uint8_t t; /* Type */
- uint8_t v[GTPIE_MAX_TV]; /* Pointer to value */
-}__attribute__((packed));
+struct gtpie_tv0 { /* 1 byte type value pair */
+ uint8_t t; /* Type */
+ uint8_t v[GTPIE_MAX_TV]; /* Pointer to value */
+} __attribute__ ((packed));
-struct gtpie_tv1 { /* 1 byte type value pair */
- uint8_t t; /* Type */
- uint8_t v; /* Value */
-}__attribute__((packed));
+struct gtpie_tv1 { /* 1 byte type value pair */
+ uint8_t t; /* Type */
+ uint8_t v; /* Value */
+} __attribute__ ((packed));
-struct gtpie_tv2 { /* 2 byte type value pair */
- uint8_t t; /* Type */
- uint16_t v; /* Value */
-}__attribute__((packed));
+struct gtpie_tv2 { /* 2 byte type value pair */
+ uint8_t t; /* Type */
+ uint16_t v; /* Value */
+} __attribute__ ((packed));
-struct gtpie_tv4 { /* 4 byte type value pair */
- uint8_t t; /* Type */
- uint32_t v; /* Value */
-}__attribute__((packed));
+struct gtpie_tv4 { /* 4 byte type value pair */
+ uint8_t t; /* Type */
+ uint32_t v; /* Value */
+} __attribute__ ((packed));
-struct gtpie_tv8 { /* 8 byte type value pair */
- uint8_t t; /* Type */
- uint64_t v; /* Value */
-}__attribute__((packed));
-
+struct gtpie_tv8 { /* 8 byte type value pair */
+ uint8_t t; /* Type */
+ uint64_t v; /* Value */
+} __attribute__ ((packed));
union gtpie_member {
- uint8_t t;
- struct gtpie_ext ext;
- struct gtpie_tlv tlv;
- struct gtpie_tv0 tv0;
- struct gtpie_tv1 tv1;
- struct gtpie_tv2 tv2;
- struct gtpie_tv4 tv4;
- struct gtpie_tv8 tv8;
-}__attribute__((packed));
+ uint8_t t;
+ struct gtpie_ext ext;
+ struct gtpie_tlv tlv;
+ struct gtpie_tv0 tv0;
+ struct gtpie_tv1 tv1;
+ struct gtpie_tv2 tv2;
+ struct gtpie_tv4 tv4;
+ struct gtpie_tv8 tv8;
+} __attribute__ ((packed));
/*
cause
@@ -214,45 +210,46 @@
*/
struct tlv1 {
- uint8_t type;
- uint8_t length;
-}__attribute__((packed));
+ uint8_t type;
+ uint8_t length;
+} __attribute__ ((packed));
struct tlv2 {
- uint8_t type;
- uint16_t length;
-}__attribute__((packed));
+ uint8_t type;
+ uint16_t length;
+} __attribute__ ((packed));
extern int gtpie_tlv(void *p, unsigned int *length, unsigned int size,
uint8_t t, int l, void *v);
-extern int gtpie_tv0(void *p, unsigned int *length, unsigned int size,
- uint8_t t, int l, uint8_t *v);
-extern int gtpie_tv1(void *p, unsigned int *length, unsigned int size, uint8_t t, uint8_t v);
-extern int gtpie_tv2(void *p, unsigned int *length, unsigned int size, uint8_t t, uint16_t v);
-extern int gtpie_tv4(void *p, unsigned int *length, unsigned int size, uint8_t t, uint32_t v);
-extern int gtpie_tv8(void *p, unsigned int *length, unsigned int size, uint8_t t, uint64_t v);
-extern int gtpie_getie(union gtpie_member* ie[], int type, int instance);
-extern int gtpie_exist(union gtpie_member* ie[], int type, int instance);
-extern int gtpie_gettlv(union gtpie_member* ie[], int type, int instance,
+extern int gtpie_tv0(void *p, unsigned int *length, unsigned int size,
+ uint8_t t, int l, uint8_t * v);
+extern int gtpie_tv1(void *p, unsigned int *length, unsigned int size,
+ uint8_t t, uint8_t v);
+extern int gtpie_tv2(void *p, unsigned int *length, unsigned int size,
+ uint8_t t, uint16_t v);
+extern int gtpie_tv4(void *p, unsigned int *length, unsigned int size,
+ uint8_t t, uint32_t v);
+extern int gtpie_tv8(void *p, unsigned int *length, unsigned int size,
+ uint8_t t, uint64_t v);
+extern int gtpie_getie(union gtpie_member *ie[], int type, int instance);
+extern int gtpie_exist(union gtpie_member *ie[], int type, int instance);
+extern int gtpie_gettlv(union gtpie_member *ie[], int type, int instance,
unsigned int *length, void *dst, unsigned int size);
-extern int gtpie_gettv0(union gtpie_member* ie[], int type, int instance,
+extern int gtpie_gettv0(union gtpie_member *ie[], int type, int instance,
void *dst, unsigned int size);
-extern int gtpie_gettv1(union gtpie_member* ie[], int type, int instance,
- uint8_t *dst);
-extern int gtpie_gettv2(union gtpie_member* ie[], int type, int instance,
- uint16_t *dst);
-extern int gtpie_gettv4(union gtpie_member* ie[], int type, int instance,
- uint32_t *dst);
-extern int gtpie_gettv8(union gtpie_member* ie[], int type, int instance,
- uint64_t *dst);
+extern int gtpie_gettv1(union gtpie_member *ie[], int type, int instance,
+ uint8_t * dst);
+extern int gtpie_gettv2(union gtpie_member *ie[], int type, int instance,
+ uint16_t * dst);
+extern int gtpie_gettv4(union gtpie_member *ie[], int type, int instance,
+ uint32_t * dst);
+extern int gtpie_gettv8(union gtpie_member *ie[], int type, int instance,
+ uint64_t * dst);
-extern int gtpie_decaps(union gtpie_member* ie[], int version,
+extern int gtpie_decaps(union gtpie_member *ie[], int version,
void *pack, unsigned len);
-extern int gtpie_encaps(union gtpie_member* ie[], void *pack, unsigned *len);
+extern int gtpie_encaps(union gtpie_member *ie[], void *pack, unsigned *len);
extern int gtpie_encaps2(union gtpie_member ie[], unsigned int size,
- void *pack, unsigned *len);
+ void *pack, unsigned *len);
-
-#endif /* !_GTPIE_H */
-
-
+#endif /* !_GTPIE_H */