maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restored -K option in oaisim.

Browse Source 
Fixed some warnings.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4313 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
winckel
2013-10-31 17:58:50 +00:00
parent c560dac658
commit ee0bc07beb
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/UTIL/OTG/otg_tx.c
+4 -6
View File
@@ -201,7 +201,7 @@ int adjust_size(int size){
unsigned char *packet_gen(int src, int dst, int app, int ctime, int * pkt_size){ // when pdcp, ctime = frame cnt unsigned char *packet_gen(int src, int dst, int app, int ctime, unsigned int * pkt_size){ // when pdcp, ctime = frame cnt
//unsigned char *packet=NULL; //unsigned char *packet=NULL;
unsigned int size=0; unsigned int size=0;
@@ -212,7 +212,7 @@ unsigned char *packet_gen(int src, int dst, int app, int ctime, int * pkt_size){
unsigned int flag; unsigned int flag;
char *payload=NULL; char *payload=NULL;
char *header=NULL; char *header=NULL;
int header_size; int header_size = 0;
// check if the app is configured // check if the app is configured
@@ -242,7 +242,7 @@ Send Packets when:
header = random_string(otg_info->header_size[src][dst], g_otg->packet_gen_type, HEADER_ALPHABET); header = random_string(otg_info->header_size[src][dst], g_otg->packet_gen_type, HEADER_ALPHABET);
header_size = (header != NULL)? strlen(header) : 0; header_size = (header != NULL)? strlen(header) : 0;
payload = random_string(size, RANDOM_STRING, PAYLOAD_ALPHABET); payload = random_string(size, RANDOM_STRING, PAYLOAD_ALPHABET);
if (payload == NULL) return; if (payload == NULL) return NULL;
flag=0xffff; flag=0xffff;
flow=otg_info->flow_id[src][dst]; flow=otg_info->flow_id[src][dst];
seq_num=otg_info->seq_num[src][dst][otg_info->traffic_type[src][dst]]; seq_num=otg_info->seq_num[src][dst][otg_info->traffic_type[src][dst]];
@@ -501,8 +501,6 @@ unsigned int get_application_state(int src, int dst, int application, int ctime)
void header_size_gen(int src, int dst, int application){ void header_size_gen(int src, int dst, int application){
unsigned int size_header=0; unsigned int size_header=0;
unsigned int type_header=0;
if (otg_info->header_size_app[src][dst][application]==0) if (otg_info->header_size_app[src][dst][application]==0)
{ {
@@ -632,7 +630,7 @@ unsigned char * serialize_buffer(char* header, char* payload, unsigned int buffe
if (header == NULL || payload == NULL) if (header == NULL || payload == NULL)
return NULL; return NULL;
// allocate memory for the tx_buffer // allocate memory for the tx_buffer
tx_buffer= (char*)malloc(buffer_size); tx_buffer= (unsigned char*)malloc(buffer_size);
// add otg control information first for decoding and computing the statistics // add otg control information first for decoding and computing the statistics
otg_hdr_info_p = (otg_hdr_info_t *) (&tx_buffer[byte_tx_count]); otg_hdr_info_p = (otg_hdr_info_t *) (&tx_buffer[byte_tx_count]);
otg_hdr_info_p->size = buffer_size; otg_hdr_info_p->size = buffer_size;
openair2/UTIL/OTG/otg_tx.h
+1 -1
View File
@@ -94,7 +94,7 @@ char * random_string(int size, ALPHABET_GEN mode, ALPHABET_TYPE data_type);
* \note * \note
* @ingroup _otg * @ingroup _otg
*/ */
unsigned char *packet_gen(int src, int dst, int app, int ctime, int *pkt_size); unsigned char *packet_gen(int src, int dst, int app, int ctime, unsigned int *pkt_size);
/*! \fn char *header_gen(int hdr_size); /*! \fn char *header_gen(int hdr_size);
targets/SIMU/USER/oaisim_functions.c
+3 -2
View File
@@ -24,6 +24,7 @@
#include "UTIL/LOG/vcd_signal_dumper.h" #include "UTIL/LOG/vcd_signal_dumper.h"
#include "UTIL/OPT/opt.h" #include "UTIL/OPT/opt.h"
#include "UTIL/OTG/otg_config.h" #include "UTIL/OTG/otg_config.h"
#include "UTIL/OTG/otg_tx.h"
#include "cor_SF_sim.h" #include "cor_SF_sim.h"
@@ -114,7 +115,7 @@ void get_simulation_options(int argc, char *argv[]) {
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };
while ((c = getopt_long (argc, argv, "aA:b:B:c:C:D:d:eE:f:FGg:hHi:IJ:j:k:l:L:m:M:n:N:oO:p:P:Q:rR:s:S:t:T:u:U:vVw:W:x:X:y:Y:z:Z:", long_options, &option_index)) != -1) { while ((c = getopt_long (argc, argv, "aA:b:B:c:C:D:d:eE:f:FGg:hHi:IJ:j:k:K:l:L:m:M:n:N:oO:p:P:Q:rR:s:S:t:T:u:U:vVw:W:x:X:y:Y:z:Z:", long_options, &option_index)) != -1) {
switch (c) { switch (c) {
case 0: case 0:
if (! strcmp(long_options[option_index].name, "pdcp_period")) { if (! strcmp(long_options[option_index].name, "pdcp_period")) {
@@ -958,7 +959,7 @@ void update_otg_UE(int UE_id, unsigned int ctime) {
if (mac_get_rrc_status(UE_id, 0/*eNB_flag*/, dst_id ) > 2 /*RRC_CONNECTED*/) { if (mac_get_rrc_status(UE_id, 0/*eNB_flag*/, dst_id ) > 2 /*RRC_CONNECTED*/) {
Packet_otg_elt *otg_pkt = malloc (sizeof(Packet_otg_elt)); Packet_otg_elt *otg_pkt = malloc (sizeof(Packet_otg_elt));
// Manage to add this packet to the tail of your list // Manage to add this packet to the tail of your list
(otg_pkt->otg_pkt).sdu_buffer = (u8*) packet_gen(src_id, dst_id, ctime, &((otg_pkt->otg_pkt).sdu_buffer_size)); (otg_pkt->otg_pkt).sdu_buffer = (u8*) packet_gen(src_id, dst_id, 0, ctime, &((otg_pkt->otg_pkt).sdu_buffer_size));
if ((otg_pkt->otg_pkt).sdu_buffer != NULL) { if ((otg_pkt->otg_pkt).sdu_buffer != NULL) {
(otg_pkt->otg_pkt).rb_id = dst_id * NB_RB_MAX + DTCH; (otg_pkt->otg_pkt).rb_id = dst_id * NB_RB_MAX + DTCH;