From dfafa3a927d55d27b2e25b96dc0faff4da0c640f Mon Sep 17 00:00:00 2001 From: Alan Tsai Date: Fri, 23 Sep 2016 16:53:35 -0700 Subject: [PATCH] Selective merge from 9.2.0-merge branch Did not cherry pick AKA' changes --- Makefile | 4 ++-- Makefile.inc | 4 +++- WTGService/Makefile | 2 +- WTGService/WTG.c | 2 +- WTGService/WTG.conf | 2 +- WTGService/WTG.h | 2 +- WTGService/WTGService.sh | 2 +- WTGService/WTGService_VE.sh | 2 +- WTGService/installWTG.sh | 2 +- WTGService/startPCE_VE.sh | 2 +- WTGService/uninstallWTG.sh | 2 +- buildEssentials.sh | 7 +++++-- ca/Makefile | 2 +- ca/wfa_ca.c | 2 +- console_src/Makefile | 2 +- console_src/mpx.c | 2 +- console_src/mpx.h | 2 +- console_src/wfa_con.c | 2 +- console_src/wfa_con.h | 2 +- console_src/wfa_sndrcv.c | 2 +- console_src/wfa_util.c | 2 +- dut/Makefile | 2 +- dut/wfa_dut.c | 2 +- dut/wfa_dut.h | 2 +- dut/wfa_dut_init.c | 2 +- inc/wfa_agt.h | 2 +- inc/wfa_agtctrl.h | 2 +- inc/wfa_ca.h | 2 +- inc/wfa_ca_resp.h | 2 +- inc/wfa_cmds.h | 5 +++-- inc/wfa_debug.h | 2 +- inc/wfa_main.h | 2 +- inc/wfa_miscs.h | 2 +- inc/wfa_portall.h | 2 +- inc/wfa_rsp.h | 2 +- inc/wfa_sock.h | 2 +- inc/wfa_stdincs.h | 2 +- inc/wfa_tg.h | 2 +- inc/wfa_tlv.h | 2 +- inc/wfa_tlv_old.h | 2 +- inc/wfa_types.h | 2 +- inc/wfa_utils.h | 2 +- inc/wfa_ver.h | 4 ++-- inc/wfa_wmmps.h | 2 +- lib/Makefile | 2 +- lib/wfa_ca_resp.c | 22 +++++++++++++--------- lib/wfa_cmdproc.c | 9 +++++++-- lib/wfa_cmdtbl.c | 2 +- lib/wfa_cs.c | 2 +- lib/wfa_miscs.c | 2 +- lib/wfa_sock.c | 2 +- lib/wfa_tg.c | 32 +++++++++++++++++++++----------- lib/wfa_thr.c | 5 +++-- lib/wfa_tlv.c | 2 +- lib/wfa_typestr.c | 2 +- lib/wfa_wmmps.c | 2 +- scripts/arp_neigh_loop | 2 +- scripts/dev_send_frame | 2 +- scripts/findprocess.sh | 6 ++++++ scripts/getipconfig.sh | 2 +- scripts/getpid.sh | 2 +- scripts/getpstats.sh | 2 +- scripts/gpstats.sh | 2 +- scripts/sta_reset_parm | 2 +- scripts/stoping.sh | 2 +- scripts/updatepid.sh | 2 +- scripts/wfa_test_cli.sh | 2 +- scripts/wfaping.sh | 2 +- scripts/wfaping6.sh | 2 +- 69 files changed, 124 insertions(+), 92 deletions(-) create mode 100644 scripts/findprocess.sh diff --git a/Makefile b/Makefile index 204daa1..2c41a17 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ # include Makefile.inc -DIRS= ${LIB} ${DUT} ${CA} ${TC} +DIRS= ${LIB} ${DUT} ${CA} ${TC} ${WTG} ${CON} all: for i in ${DIRS}; do \ diff --git a/Makefile.inc b/Makefile.inc index 94f7930..b0edf5a 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -18,6 +18,8 @@ LIB=lib DUT=dut CA=ca UCC=ucc +CON=console_src +WTG=WTGService MAKE=make # This is for WMM-PS diff --git a/WTGService/Makefile b/WTGService/Makefile index 16efb0b..5312eb6 100644 --- a/WTGService/Makefile +++ b/WTGService/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/WTGService/WTG.c b/WTGService/WTG.c index 64a5527..0cd8030 100644 --- a/WTGService/WTG.c +++ b/WTGService/WTG.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/WTGService/WTG.conf b/WTGService/WTG.conf index 2c7c6f3..3b0fd65 100644 --- a/WTGService/WTG.conf +++ b/WTGService/WTG.conf @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/WTGService/WTG.h b/WTGService/WTG.h index 0e267d5..cb08443 100644 --- a/WTGService/WTG.h +++ b/WTGService/WTG.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/WTGService/WTGService.sh b/WTGService/WTGService.sh index 58deec0..50cbcac 100644 --- a/WTGService/WTGService.sh +++ b/WTGService/WTGService.sh @@ -1,7 +1,7 @@ #!/bin/sh -e # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/WTGService/WTGService_VE.sh b/WTGService/WTGService_VE.sh index 81874bf..7eac4be 100644 --- a/WTGService/WTGService_VE.sh +++ b/WTGService/WTGService_VE.sh @@ -1,7 +1,7 @@ #!/bin/sh -e # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/WTGService/installWTG.sh b/WTGService/installWTG.sh index 43d9e33..2d241ac 100644 --- a/WTGService/installWTG.sh +++ b/WTGService/installWTG.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/WTGService/startPCE_VE.sh b/WTGService/startPCE_VE.sh index c57a7be..3d84d60 100644 --- a/WTGService/startPCE_VE.sh +++ b/WTGService/startPCE_VE.sh @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/WTGService/uninstallWTG.sh b/WTGService/uninstallWTG.sh index e8a60ec..31fd4c8 100644 --- a/WTGService/uninstallWTG.sh +++ b/WTGService/uninstallWTG.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/buildEssentials.sh b/buildEssentials.sh index cd67a22..b2e25f3 100644 --- a/buildEssentials.sh +++ b/buildEssentials.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -18,9 +18,12 @@ #To install the build essentials +lsb_release -a | grep Release: | grep 6.* +if [ $? -eq 0 ] +then cp /etc/apt/sources.list /etc/apt/sources.list.orig cp -f sources.list /etc/apt - +fi apt-get update echo y > yfile diff --git a/ca/Makefile b/ca/Makefile index e0cdee7..1e4f501 100644 --- a/ca/Makefile +++ b/ca/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/ca/wfa_ca.c b/ca/wfa_ca.c index d490604..a137c30 100644 --- a/ca/wfa_ca.c +++ b/ca/wfa_ca.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/console_src/Makefile b/console_src/Makefile index ddd4867..8282283 100644 --- a/console_src/Makefile +++ b/console_src/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/console_src/mpx.c b/console_src/mpx.c index 22f0dc8..376875e 100644 --- a/console_src/mpx.c +++ b/console_src/mpx.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/console_src/mpx.h b/console_src/mpx.h index 65ab2f3..f9ecf1d 100644 --- a/console_src/mpx.h +++ b/console_src/mpx.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/console_src/wfa_con.c b/console_src/wfa_con.c index b6c9d57..808ab83 100644 --- a/console_src/wfa_con.c +++ b/console_src/wfa_con.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/console_src/wfa_con.h b/console_src/wfa_con.h index 4bab607..6c1c1df 100644 --- a/console_src/wfa_con.h +++ b/console_src/wfa_con.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/console_src/wfa_sndrcv.c b/console_src/wfa_sndrcv.c index da29c5e..fb49331 100644 --- a/console_src/wfa_sndrcv.c +++ b/console_src/wfa_sndrcv.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/console_src/wfa_util.c b/console_src/wfa_util.c index 9c71b22..8d51a60 100644 --- a/console_src/wfa_util.c +++ b/console_src/wfa_util.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/dut/Makefile b/dut/Makefile index 436a99d..e5c4ec3 100644 --- a/dut/Makefile +++ b/dut/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/dut/wfa_dut.c b/dut/wfa_dut.c index 6afa4e5..ae5b9b1 100644 --- a/dut/wfa_dut.c +++ b/dut/wfa_dut.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/dut/wfa_dut.h b/dut/wfa_dut.h index 3719065..062e72a 100644 --- a/dut/wfa_dut.h +++ b/dut/wfa_dut.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/dut/wfa_dut_init.c b/dut/wfa_dut_init.c index d24bf49..b954021 100644 --- a/dut/wfa_dut_init.c +++ b/dut/wfa_dut_init.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_agt.h b/inc/wfa_agt.h index d9da75c..7dc609c 100644 --- a/inc/wfa_agt.h +++ b/inc/wfa_agt.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_agtctrl.h b/inc/wfa_agtctrl.h index 0c91742..95a281e 100644 --- a/inc/wfa_agtctrl.h +++ b/inc/wfa_agtctrl.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_ca.h b/inc/wfa_ca.h index 60a13aa..be906a9 100644 --- a/inc/wfa_ca.h +++ b/inc/wfa_ca.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_ca_resp.h b/inc/wfa_ca_resp.h index c7cd159..6a49989 100644 --- a/inc/wfa_ca_resp.h +++ b/inc/wfa_ca_resp.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_cmds.h b/inc/wfa_cmds.h index b0a003f..6e8c79f 100644 --- a/inc/wfa_cmds.h +++ b/inc/wfa_cmds.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -423,7 +423,7 @@ enum PROG_TYPE_WFDS, PROG_TYPE_HS2, PROG_TYPE_HS2_R2, - PROG_TYPE_NAN + PROG_TYPE_NAN, }; typedef struct ca_sta_dev_sendframe @@ -1236,6 +1236,7 @@ typedef struct ca_sta_preset_parameters BYTE ftoa; BYTE ftds; BYTE activescan; + WORD oper_chn; BYTE tdls; BYTE tdlsMode; diff --git a/inc/wfa_debug.h b/inc/wfa_debug.h index b26a516..ec12de2 100644 --- a/inc/wfa_debug.h +++ b/inc/wfa_debug.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_main.h b/inc/wfa_main.h index 33feb25..1fb174b 100644 --- a/inc/wfa_main.h +++ b/inc/wfa_main.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_miscs.h b/inc/wfa_miscs.h index a39faa4..3e5fb67 100644 --- a/inc/wfa_miscs.h +++ b/inc/wfa_miscs.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_portall.h b/inc/wfa_portall.h index ca19143..b426111 100644 --- a/inc/wfa_portall.h +++ b/inc/wfa_portall.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_rsp.h b/inc/wfa_rsp.h index c15f6c4..7a16a7f 100644 --- a/inc/wfa_rsp.h +++ b/inc/wfa_rsp.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_sock.h b/inc/wfa_sock.h index 27aafce..019f061 100644 --- a/inc/wfa_sock.h +++ b/inc/wfa_sock.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_stdincs.h b/inc/wfa_stdincs.h index da671df..275bfcb 100644 --- a/inc/wfa_stdincs.h +++ b/inc/wfa_stdincs.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_tg.h b/inc/wfa_tg.h index 029fb9c..799bf9f 100644 --- a/inc/wfa_tg.h +++ b/inc/wfa_tg.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_tlv.h b/inc/wfa_tlv.h index 204897a..4ee1a14 100644 --- a/inc/wfa_tlv.h +++ b/inc/wfa_tlv.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_tlv_old.h b/inc/wfa_tlv_old.h index 73d6211..7962c12 100644 --- a/inc/wfa_tlv_old.h +++ b/inc/wfa_tlv_old.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_types.h b/inc/wfa_types.h index 9f21519..4f3680c 100644 --- a/inc/wfa_types.h +++ b/inc/wfa_types.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_utils.h b/inc/wfa_utils.h index 33da38e..890f46f 100644 --- a/inc/wfa_utils.h +++ b/inc/wfa_utils.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/inc/wfa_ver.h b/inc/wfa_ver.h index 4f9f551..7203568 100644 --- a/inc/wfa_ver.h +++ b/inc/wfa_ver.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -21,6 +21,6 @@ #define WFA_VER_H #define WFA_VERNAM_LEN 32 -#define WFA_SYSTEM_VER "PCEDUT-Wi-FiTestSuite- 9.0.0" +#define WFA_SYSTEM_VER "PCEDUT-Wi-FiTestSuite- 9.2.0" #endif diff --git a/inc/wfa_wmmps.h b/inc/wfa_wmmps.h index 20d554b..5c2c0f9 100644 --- a/inc/wfa_wmmps.h +++ b/inc/wfa_wmmps.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/lib/Makefile b/lib/Makefile index 6533590..ffcef94 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/lib/wfa_ca_resp.c b/lib/wfa_ca_resp.c index 542a22f..d73dadd 100644 --- a/lib/wfa_ca_resp.c +++ b/lib/wfa_ca_resp.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -139,8 +139,8 @@ dutCommandRespFuncPtr wfaCmdRespProcFuncTbl[WFA_STA_RESPONSE_END+1] = wfaStaManageServiceResp, /* 82*/ wfaStaGetEventsResp, /* 83*/ wfaStaGetEventDataResp, /* 84*/ - wfaStaGenericResp, /* 85 */ - wfaStaExecActionResp, /* 86 */ + wfaStaGenericResp, /* 85 */ + wfaStaExecActionResp, /* 86 */ }; @@ -1304,7 +1304,11 @@ int wfaStaInvokeCommandResp(BYTE *cmdBuf) for (i =0 ; i < invokeCmdResp->invokeCmdResp.advRsp.numServInfo; i++) { - sprintf(serviceList, "%s %s",serviceList,invokeCmdResp->invokeCmdResp.advRsp.servAdvInfo[i].servName ); + if (serviceList[0] == '\0') { + sprintf(serviceList, "%s", invokeCmdResp->invokeCmdResp.advRsp.servAdvInfo[i].servName); + } else { + sprintf(serviceList, "%s %s", serviceList, invokeCmdResp->invokeCmdResp.advRsp.servAdvInfo[i].servName); + } sprintf(advidList, "%s %lx", advidList,invokeCmdResp->invokeCmdResp.advRsp.servAdvInfo[i].advtID ); sprintf(serviceMac, "%s %s", serviceMac,invokeCmdResp->invokeCmdResp.advRsp.servAdvInfo[i].serviceMac ); } @@ -1392,11 +1396,11 @@ int wfaStaManageServiceResp(BYTE *cmdBuf) int wfaStaGetEventsResp(BYTE *cmdBuf) { int done=0; - dutCmdResponse_t *dutResp = (dutCmdResponse_t *) (cmdBuf + 4); - caStaGetEventListCmdResp_t *resonse= &dutResp->cmdru.staGetEvents; + dutCmdResponse_t *getEventsResp = (dutCmdResponse_t *) (cmdBuf + 4); + caStaGetEventsResp_t *getEvents= &getEventsResp->cmdru.getEvents; DPRINT_INFO(WFA_OUT, "Entering wfaStaGetEventsResp ...\n"); - switch(dutResp->status) + switch(getEventsResp->status) { case STATUS_RUNNING: DPRINT_INFO(WFA_OUT, "wfaStaGetEventsResp running ...\n"); @@ -1404,8 +1408,8 @@ int wfaStaGetEventsResp(BYTE *cmdBuf) break; case STATUS_COMPLETE: - sprintf(gRespStr, "status,COMPLETE,EventList,%s\r\n", resonse->result); - printf("status,COMPLETE,EventList,%s\r\n",resonse->result ); + sprintf(gRespStr, "status,COMPLETE,EventName,%s,RemoteInstanceID,%u,LocalInstanceID,%u,mac,%s\r\n", getEvents->eventName,getEvents->remoteInstanceID,getEvents->localInstanceID,getEvents->mac); + printf("status,COMPLETE,EventName,%s,RemoteInstanceID,%u,LocalInstanceID,%u,mac,%s\r\n", getEvents->eventName,getEvents->remoteInstanceID,getEvents->localInstanceID,getEvents->mac); break; default: diff --git a/lib/wfa_cmdproc.c b/lib/wfa_cmdproc.c index f4e5fe4..9007f13 100644 --- a/lib/wfa_cmdproc.c +++ b/lib/wfa_cmdproc.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -5205,6 +5205,11 @@ int xcCmdProcStaPresetTestParameters(char *pcmdStr, BYTE *aBuf, int *aLen) { presetTestParams->wfdDeviceDiscoverability= eDisable; } + } + else if(strcasecmp(str, "oper_chn") == 0) + { + str = strtok_r(NULL, ",", &pcmdStr); + presetTestParams->oper_chn= atoi(str); } else if (strcasecmp(str, "program") == 0) { @@ -5329,7 +5334,7 @@ int xcCmdProcStaResetDefault(char *pcmdStr, BYTE *aBuf, int *aLen) str = strtok_r(NULL, ",", &pcmdStr); strncpy(reset->intf, str, 15); } - else if(strcasecmp(str, "prog") == 0) // VHT, 11n, VOE; HS2; HS2-R2, etc + else if(strcasecmp(str, "prog") == 0) // VHT, 11n, VOE; HS2; HS2-R2, NAN etc { str = strtok_r(NULL, ",", &pcmdStr); strncpy(reset->prog, str, sizeof(reset->prog)); diff --git a/lib/wfa_cmdtbl.c b/lib/wfa_cmdtbl.c index d40e307..d4fc63f 100644 --- a/lib/wfa_cmdtbl.c +++ b/lib/wfa_cmdtbl.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/lib/wfa_cs.c b/lib/wfa_cs.c index 983a397..6b1f5a2 100644 --- a/lib/wfa_cs.c +++ b/lib/wfa_cs.c @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright (c) 2015 Wi-Fi Alliance. All Rights Reserved +Copyright (c) 2016 Wi-Fi Alliance. All Rights Reserved Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission diff --git a/lib/wfa_miscs.c b/lib/wfa_miscs.c index b399375..025029e 100644 --- a/lib/wfa_miscs.c +++ b/lib/wfa_miscs.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/lib/wfa_sock.c b/lib/wfa_sock.c index 0ac8af6..fbc68f5 100644 --- a/lib/wfa_sock.c +++ b/lib/wfa_sock.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/lib/wfa_tg.c b/lib/wfa_tg.c index 81565bc..73069ed 100644 --- a/lib/wfa_tg.c +++ b/lib/wfa_tg.c @@ -1,7 +1,7 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -1344,12 +1344,12 @@ int wfaSendBitrateData(int mySockfd, int streamId, BYTE *pRespBuf, int *pRespLen int packLen, bytesSent, rate; int sleepTimePerSent = 0, nOverTimeCount = 0, nDuration=0, nOverSend=0; unsigned long long int sleepTotal=0, extraTimeSpendOnSending=0; /* sleep mil-sec per sending */ - int counter = 0, i; /* frame data sending count */ + int counter = 0, i, iSleep; /* frame data sending count */ unsigned long difftime; dutCmdResponse_t sendResp; //int throttledRate = 0; - struct timeval before, after; + struct timeval before, after, stime; DPRINT_INFO(WFA_OUT, "wfaSendBitrateData entering\n"); /* error check section */ @@ -1400,6 +1400,9 @@ int wfaSendBitrateData(int mySockfd, int streamId, BYTE *pRespBuf, int *pRespLen goto errcleanup; } memset(packBuf, 0, packLen + 4); + /* fill in the header */ + wSTRNCPY(packBuf, "1345678", sizeof(tgHeader_t)); + /* initialize the destination address */ memset(&toAddr, 0, sizeof(toAddr)); toAddr.sin_family = AF_INET; @@ -1414,15 +1417,22 @@ int wfaSendBitrateData(int mySockfd, int streamId, BYTE *pRespBuf, int *pRespLen runLoop=1; /* global defined share with thread routine, should remove it later */ while ( runLoop) { - int iSleep = 0; + iSleep = 1; gettimeofday(&before, NULL); /* send data per second loop */ for ( i=0; i<= (theProf->rate); i++) { counter++; - iSleep++; + //iSleep++; /* fill in the counter */ int2BuffBigEndian(counter, &((tgHeader_t *)packBuf)->hdr[8]); + /* + * Fill the timestamp to the header. + */ + wGETTIMEOFDAY(&stime, NULL); + int2BuffBigEndian(stime.tv_sec, &((tgHeader_t *)packBuf)->hdr[12]); + int2BuffBigEndian(stime.tv_usec, &((tgHeader_t *)packBuf)->hdr[16]); + bytesSent = wfaTrafficSendTo(mySockfd, packBuf, packLen, (struct sockaddr *)&toAddr); if(bytesSent != -1) @@ -1440,16 +1450,16 @@ int wfaSendBitrateData(int mySockfd, int streamId, BYTE *pRespBuf, int *pRespLen i--; } /* sleep per batch sending */ - if ( i == (theProf->rate/10) * iSleep) + if ( i == ((int)(theProf->rate/50)) * iSleep) { - wfaSleepMilsec(5); - sleepTotal = sleepTotal + (unsigned long long int) 5; + wfaSleepMilsec(10); + sleepTotal = sleepTotal + (unsigned long long int) 10; iSleep++; } }// for loop per second sending - iSleep = 0; + //iSleep = 0; nDuration++; /*calculate second rest part need to sleep */ @@ -1513,8 +1523,8 @@ int wfaSendBitrateData(int mySockfd, int streamId, BYTE *pRespBuf, int *pRespLen *pRespLen = WFA_TLV_HDR_LEN + sizeof(dutCmdResponse_t); extraTimeSpendOnSending = extraTimeSpendOnSending/1000; - DPRINT_INFO(WFA_OUT, "*** wfg_tg.cpp wfaSendBitrateData Count=%i txFrames=%i totalByteSent=%i sleepTotal=%llu milSec extraTimeSpendOnSending=%llu nOverTimeCount=%d nOverSend=%i rate=%d nDuration=%d ***\n", - counter, (myStream->stats.txFrames),(unsigned int) (myStream->stats.txPayloadBytes), sleepTotal,extraTimeSpendOnSending, nOverTimeCount, nOverSend, theProf->rate , nDuration); + DPRINT_INFO(WFA_OUT, "*** wfg_tg.cpp wfaSendBitrateData Count=%i txFrames=%i totalByteSent=%i sleepTotal=%llu milSec extraTimeSpendOnSending=%llu nOverTimeCount=%d nOverSend=%i rate=%d nDuration=%d iSleep=%d ***\n", + counter, (myStream->stats.txFrames),(unsigned int) (myStream->stats.txPayloadBytes), sleepTotal,extraTimeSpendOnSending, nOverTimeCount, nOverSend, theProf->rate , nDuration,iSleep); wfaSleepMilsec(1000); return ret; diff --git a/lib/wfa_thr.c b/lib/wfa_thr.c index dfaae34..8585455 100644 --- a/lib/wfa_thr.c +++ b/lib/wfa_thr.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -697,7 +697,8 @@ void * wfa_wmm_thread(void *thr_param) setsockopt(mySock, SOL_SOCKET, SO_SNDBUF, (char *)&iOptVal, (socklen_t )iOptLen); if ( (myProfile->rate != 0 ) /* WFA_SEND_FIX_BITRATE_MAX_FRAME_RATE)*/ && - (myProfile->pksize * myProfile->rate * 8 < WFA_SEND_FIX_BITRATE_MAX) ) + (myProfile->pksize * myProfile->rate * 8 < WFA_SEND_FIX_BITRATE_MAX) && + (myProfile->trafficClass != TG_WMM_AC_VO) ) wfaSendBitrateData(mySock, myStreamId, respBuf, &respLen); else { diff --git a/lib/wfa_tlv.c b/lib/wfa_tlv.c index 23d5b44..fc5074d 100644 --- a/lib/wfa_tlv.c +++ b/lib/wfa_tlv.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/lib/wfa_typestr.c b/lib/wfa_typestr.c index 71ce06f..15e9707 100644 --- a/lib/wfa_typestr.c +++ b/lib/wfa_typestr.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/lib/wfa_wmmps.c b/lib/wfa_wmmps.c index 79cca09..91b4eb8 100644 --- a/lib/wfa_wmmps.c +++ b/lib/wfa_wmmps.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (c) 2015 Wi-Fi Alliance +* Copyright (c) 2016 Wi-Fi Alliance * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/scripts/arp_neigh_loop b/scripts/arp_neigh_loop index 8fa7719..64e5b82 100644 --- a/scripts/arp_neigh_loop +++ b/scripts/arp_neigh_loop @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/scripts/dev_send_frame b/scripts/dev_send_frame index ca0cc75..9e6afd3 100644 --- a/scripts/dev_send_frame +++ b/scripts/dev_send_frame @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/scripts/findprocess.sh b/scripts/findprocess.sh new file mode 100644 index 0000000..97ee38c --- /dev/null +++ b/scripts/findprocess.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +pid=$(pgrep $1) +echo $pid + +echo $pid >> $2 diff --git a/scripts/getipconfig.sh b/scripts/getipconfig.sh index f82a310..6802521 100644 --- a/scripts/getipconfig.sh +++ b/scripts/getipconfig.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/scripts/getpid.sh b/scripts/getpid.sh index c4b8fb5..eb6435e 100644 --- a/scripts/getpid.sh +++ b/scripts/getpid.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/scripts/getpstats.sh b/scripts/getpstats.sh index b344cc7..c818f82 100644 --- a/scripts/getpstats.sh +++ b/scripts/getpstats.sh @@ -2,7 +2,7 @@ # # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/scripts/gpstats.sh b/scripts/gpstats.sh index dcb4395..b46f73e 100644 --- a/scripts/gpstats.sh +++ b/scripts/gpstats.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/scripts/sta_reset_parm b/scripts/sta_reset_parm index 2354774..2aff1f1 100644 --- a/scripts/sta_reset_parm +++ b/scripts/sta_reset_parm @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/scripts/stoping.sh b/scripts/stoping.sh index 4f8ce31..f7b0e63 100644 --- a/scripts/stoping.sh +++ b/scripts/stoping.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/scripts/updatepid.sh b/scripts/updatepid.sh index c6d7b99..4b4ddf0 100644 --- a/scripts/updatepid.sh +++ b/scripts/updatepid.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/scripts/wfa_test_cli.sh b/scripts/wfa_test_cli.sh index 4cd6621..2c607c5 100644 --- a/scripts/wfa_test_cli.sh +++ b/scripts/wfa_test_cli.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/scripts/wfaping.sh b/scripts/wfaping.sh index 78b6c18..a8cd468 100644 --- a/scripts/wfaping.sh +++ b/scripts/wfaping.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/scripts/wfaping6.sh b/scripts/wfaping6.sh index d8eba8e..262d635 100644 --- a/scripts/wfaping6.sh +++ b/scripts/wfaping6.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2015 Wi-Fi Alliance +# Copyright (c) 2016 Wi-Fi Alliance # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above