5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed gtpu header flags to use a bitfield. Fixing compilation issues.

Browse Source
master
Pedro Alvarez 6 years ago
parent 569a7cbc94
commit ee04639337
5 changed files with 155 additions and 74 deletions
Show Stats Download Patch File Download Diff File

34
lib/include/srslte/upper/gtpu.h
Unescape Escape View File

@ -47,15 +47,47 @@ namespace srslte {
* 6 | TEID (2nd Octet) |
* 7 | TEID (3rd Octet) |
* 8 | TEID (4th Octet) |
* 9 | Seq Number (1st Octet) |
* 10 | Seq Number (2st Octet) |
* 11 | N-PDU |
* 12 | Next Extension Header Type |
***************************************************************************/
#define GTPU_HEADER_LEN 8
#define GTPU_BASE_HEADER_LEN 8
#define GTPU_EXTENDED_HEADER_LEN 12
#define GTPU_VERSION_V1 1
#define GTP_PRIME_PROTO 0
#define GTP_PROTO 1
#define GTPU_MSG_ECHO_REQUEST 0
#define GTPU_MSG_ECHO_RESPONSE 1
#define GTPU_MSG_ERROR_INDICATION 26
#define GTPU_MSG_SUPPORTED_EXTENSION_HEADERS_NOTIFICATION 31
#define GTPU_MSG_END_MARKER 254
#define GTPU_MSG_DATA_PDU 255
typedef struct{
uint8_t version : 3;
uint8_t protocol_type : 1;
uint8_t star : 1;
uint8_t ext_header :1;
uint8_t sequence :1;
uint8_t pkt_number :1;
}gtpu_flags_t;
typedef struct{
union{
gtpu_flags_t flag_bits;
uint8_t flags;
} gtpu_flags;
uint8_t message_type;
uint16_t length;
uint32_t teid;
uint16_t seq_number;
uint8_t n_pdu;
uint8_t next_ext_hdr_type;
}gtpu_header_t;

61
lib/src/upper/gtpu.cc
Unescape Escape View File

@ -37,21 +37,30 @@ namespace srslte {
bool gtpu_write_header(gtpu_header_t *header, srslte::byte_buffer_t *pdu, srslte::log *gtpu_log)
{
if(header->flags != 0x30) {
gtpu_log->error("gtpu_write_header - Unhandled header flags: 0x%x\n", header->flags);
if(header->flags.version != GTPU_VERSION_V1) {
gtpu_log->error("gtpu_write_header - Unhandled GTP-U Version.\n");
return false;
}
if(header->flags.protocol_type != GTP_PROTO) {
gtpu_log->error("gtpu_write_header - Unhandled Protocol Type.\n");
return false;
}
if(header->message_type != 0xFF) {
if(header->flags.ext_header) {
gtpu_log->error("gtpu_write_header - Unhandled Header Extensions.\n");
return false;
}
if(header->message_type != GTPU_MSG_DATA_PDU) {
gtpu_log->error("gtpu_write_header - Unhandled message type: 0x%x\n", header->message_type);
return false;
}
if(pdu->get_headroom() < GTPU_HEADER_LEN) {
if(pdu->get_headroom() < GTPU_BASE_HEADER_LEN) {
gtpu_log->error("gtpu_write_header - No room in PDU for header\n");
return false;
}
pdu->msg -= GTPU_HEADER_LEN;
pdu->N_bytes += GTPU_HEADER_LEN;
pdu->msg -= GTPU_BASE_HEADER_LEN;
pdu->N_bytes += GTPU_BASE_HEADER_LEN;
uint8_t *ptr = pdu->msg;
@ -70,9 +79,6 @@ bool gtpu_read_header(srslte::byte_buffer_t *pdu, gtpu_header_t *header, srslte:
{
uint8_t *ptr = pdu->msg;
pdu->msg += GTPU_HEADER_LEN;
pdu->N_bytes -= GTPU_HEADER_LEN;
header->flags = *ptr;
ptr++;
header->message_type = *ptr;
@ -81,11 +87,42 @@ bool gtpu_read_header(srslte::byte_buffer_t *pdu, gtpu_header_t *header, srslte:
ptr += 2;
uint8_to_uint32(ptr, &header->teid);
if(header->flags != 0x30) {
gtpu_log->error("gtpu_read_header - Unhandled header flags: 0x%x\n", header->flags);
if(header->gtpu_flags.flag_bits.version != GTPU_VERSION_V1) {
gtpu_log->error("gtpu_read_header - Unhandled GTP-U version. Flags: 0x%x\n", header->gtpu_flags.flags);
return false;
}
if(header->message_type != 0xFF) {
if(header->gtpu_flags.flag_bits.protocol_type != GTP_PROTO) {
gtpu_log->error("gtpu_read_header - Unhandled GTP Protocol. Flags: 0x%x\n", header->gtpu_flags.flags);
return false;
}
if(header->gtpu_flags.flag_bits.ext_header) {
gtpu_log->error("gtpu_read_header - Unhandled GTP-U Header Extensions. Flags: 0x%x\n", header->gtpu_flags.flags);
return false;
}
//If E, S or PN are set, header is longer
if(header->gtpu_flags.flag_bits.sequence || header->gtpu_flags.flag_bits.ext_header || header->gtpu_flags.flag_bits.ext_header) {
pdu->msg += GTPU_EXTENDED_HEADER_LEN;
pdu->N_bytes -= GTPU_EXTENDED_HEADER_LEN;
uint8_to_uint16(ptr, &header->seq_number);
ptr+=2;
header->n_pdu = *ptr;
ptr++;
header->next_ext_hdr_type = *ptr;
ptr++;
} else {
pdu->msg += GTPU_BASE_HEADER_LEN;
pdu->N_bytes -= GTPU_BASE_HEADER_LEN;
}
if(header->gtpu_flags.flag_bits.sequence){
ptr+=2;
}
if(header->message_type != GTPU_MSG_DATA_PDU || header->message_type != GTPU_MSG_ECHO_REQUEST) {
gtpu_log->error("gtpu_read_header - Unhandled message type: 0x%x\n", header->message_type);
return false;
}

32
srsenb/src/upper/gtpu.cc
Unescape Escape View File

@ -122,8 +122,10 @@ void gtpu::write_pdu(uint16_t rnti, uint32_t lcid, srslte::byte_buffer_t* pdu)
{
gtpu_log->info_hex(pdu->msg, pdu->N_bytes, "TX PDU, RNTI: 0x%x, LCID: %d, n_bytes=%d", rnti, lcid, pdu->N_bytes);
gtpu_header_t header;
header.flags = 0x30;
header.message_type = 0xFF;
bzero(&header,sizeof(header));
header.flags.version = GTPU_VERSION_V1;
header.flags.protocol_type = GTP_PROTO;
header.message_type = GTPU_MSG_DATA_PDU;
header.length = pdu->N_bytes;
header.teid = rnti_bearers[rnti].teids_out[lcid];
@ -224,18 +226,19 @@ void gtpu::run_thread()
pdu->N_bytes = (uint32_t) n;
if(pdu->msg[1] == 0x01) {
if(n<10) {
gtpu_header_t header;
if(!gtpu_read_header(pdu, &header,gtpu_log)){
continue;
}
switch(header.message_type) {
case GTPU_MSG_ECHO_REQUEST:
// Echo request - send response
uint16_t seq = 0;
uint8_to_uint16(&pdu->msg[8], &seq);
echo_response(client.sin_addr.s_addr, client.sin_port, seq);
echo_response(client.sin_addr.s_addr, client.sin_port, header.seq_number);
break;
}else{
gtpu_header_t header;
gtpu_read_header(pdu, &header,gtpu_log);
case GTPU_MSG_DATA_PDU:
uint16_t rnti = 0;
uint16_t lcid = 0;
@ -266,6 +269,7 @@ void gtpu::run_thread()
usleep(10000);
}
} while(!pdu);
break;
}
}
running = false;
@ -275,6 +279,14 @@ void gtpu::echo_response(in_addr_t addr, in_port_t port, uint16_t seq)
{
gtpu_log->info("TX GTPU Echo Response, Seq: %d\n", seq);
gtpu_header_t header;
bzero(&header, sizeof(header));
//flags
header.flags.version = GTPU_VERSION_V1;
header.flags.protocol_type = GTP_PROTO;
header.flags.sequence = 1;
uint8_t resp[12];
bzero(resp, 12);
resp[0] = 0x32; //flags

15
srsepc/src/mbms-gw/mbms-gw.cc
Unescape Escape View File

@ -285,31 +285,30 @@ mbms_gw::handle_sgi_md_pdu(srslte::byte_buffer_t *msg)
{
uint8_t version;
srslte::gtpu_header_t header;
bzero(&header, sizeof(srslte::gtpu_header_t));
//Setup GTP-U header
header.flags = 0x30;
header.message_type = 0xFF;
header.flags.version = GTPU_VERSION_V1;
header.flags.protocol_type = GTP_PROTO;
header.message_type = GTPU_MSG_DATA_PDU;
header.length = msg->N_bytes;
header.teid = 0xAAAA; //FIXME Harcoded TEID for now
//Sanity Check IP packet
if(msg->N_bytes < 20)
{
if (msg->N_bytes < 20) {
m_mbms_gw_log->error("IPv4 min len: %d, drop msg len %d\n", 20, msg->N_bytes);
return;
}
//IP Headers
struct iphdr *iph = (struct iphdr *) msg->msg;
if(iph->version != 4)
{
if(iph->version != 4) {
m_mbms_gw_log->warning("IPv6 not supported yet.\n");
return;
}
//Write GTP-U header into packet
if(!srslte::gtpu_write_header(&header, msg, m_mbms_gw_log))
{
if (!srslte::gtpu_write_header(&header, msg, m_mbms_gw_log)) {
m_mbms_gw_log->console("Error writing GTP-U header on PDU\n");
}

9
srsepc/src/spgw/spgw.cc
Unescape Escape View File

@ -363,14 +363,15 @@ spgw::handle_sgi_pdu(srslte::byte_buffer_t *msg)
//Setup GTP-U header
srslte::gtpu_header_t header;
header.flags = 0x30;
header.message_type = 0xFF;
bzero(&header,sizeof(srslte::gtpu_header_t));
header.flags.version = GTPU_VERSION_V1;
header.flags.protocol_type = GTP_PROTO;
header.message_type = GTPU_MSG_DATA_PDU;
header.length = msg->N_bytes;
header.teid = enb_fteid.teid;
//Write header into packet
if(!srslte::gtpu_write_header(&header, msg, m_spgw_log))
{
if (!srslte::gtpu_write_header(&header, msg, m_spgw_log)) {
m_spgw_log->console("Error writing GTP-U header on PDU\n");
}

Write Preview
Loading…
Cancel
Save