From 3ed571f9d933e5c5dadef650c07e20e8aad06213 Mon Sep 17 00:00:00 2001 From: IPMbox Team Date: Fri, 3 Feb 2012 14:32:28 +0100 Subject: cesar, cleopatre, common: new ipmbox design, closes #848 --- cesar/test_general/dataplane/inc/context.h | 3 --- cesar/test_general/dataplane/inc/trace_dump.h | 2 +- cesar/test_general/dataplane/maximus-Makefile | 2 +- cesar/test_general/dataplane/sparc-Config | 1 + cesar/test_general/dataplane/sparc-Makefile | 2 +- cesar/test_general/dataplane/src/test_dataplane.c | 24 ++++++++++++---------- cesar/test_general/dataplane/src/trace_dump.c | 5 ----- cesar/test_general/station/common/src/station.c | 2 +- cesar/test_general/station/compliance/Makefile.mk | 4 ++-- cesar/test_general/station/fcall/src/sta_mgr.c | 2 -- cesar/test_general/station/maximus/Makefile | 4 ++-- cesar/test_general/station/scenario/Makefile | 5 +++-- .../test_general/station/scenario/py/sc15_hide.py | 2 +- .../station/scenario/py/scenario_init.py | 11 +++++----- .../test_general/station/tonemap/common-define.mk | 4 ++-- 15 files changed, 34 insertions(+), 39 deletions(-) (limited to 'cesar/test_general') diff --git a/cesar/test_general/dataplane/inc/context.h b/cesar/test_general/dataplane/inc/context.h index bae9b0c753..4307bfe168 100644 --- a/cesar/test_general/dataplane/inc/context.h +++ b/cesar/test_general/dataplane/inc/context.h @@ -20,7 +20,6 @@ #include "mac/pbproc/pbproc.h" #include "mac/sar/sar.h" #include "cl/cl.h" -#include "hle/hle.h" #include "mac/ca/test/fcall/beacon_period.h" #include "mac/common/test/fcall/set_tonemap.h" @@ -62,8 +61,6 @@ struct test_dataplane_t sar_t *sar; /** CL context. */ cl_t *cl; - /** HLE context. */ - hle_t *hle; /** Timer context. */ hal_timer_t *hal_timer; diff --git a/cesar/test_general/dataplane/inc/trace_dump.h b/cesar/test_general/dataplane/inc/trace_dump.h index 7635079caa..60395e7d6f 100644 --- a/cesar/test_general/dataplane/inc/trace_dump.h +++ b/cesar/test_general/dataplane/inc/trace_dump.h @@ -19,7 +19,7 @@ struct test_dataplane_msg_trace_dump_t /** Bundle name. */ char name[64]; /** Trace what? */ - bool all, phy, ca, pbproc, sar, cl, hle; + bool all, phy, ca, pbproc, sar, cl; }; typedef struct test_dataplane_msg_trace_dump_t test_dataplane_msg_trace_dump_t; diff --git a/cesar/test_general/dataplane/maximus-Makefile b/cesar/test_general/dataplane/maximus-Makefile index d2a72ad4af..d0c7ca88f7 100644 --- a/cesar/test_general/dataplane/maximus-Makefile +++ b/cesar/test_general/dataplane/maximus-Makefile @@ -4,7 +4,7 @@ ECOS = y TARGET_PROGRAMS = test_dataplane test_dataplane_SOURCES = test_dataplane.c trace_dump.c -test_dataplane_MODULES = lib hal mac cl hle \ +test_dataplane_MODULES = lib hal mac cl bufmgr \ host \ mac/ca/test/fcall mac/common/test/fcall diff --git a/cesar/test_general/dataplane/sparc-Config b/cesar/test_general/dataplane/sparc-Config index 591f8be235..6a841f1ab9 100644 --- a/cesar/test_general/dataplane/sparc-Config +++ b/cesar/test_general/dataplane/sparc-Config @@ -2,3 +2,4 @@ CONFIG_DEBUG_CLAIM = n CONFIG_TRACE = y CONFIG_TRACE_ON_FATAL = y CONFIG_STATS = n +CONFIG_ARCH_ILRAM_PRIO = 0 diff --git a/cesar/test_general/dataplane/sparc-Makefile b/cesar/test_general/dataplane/sparc-Makefile index a50ddac283..8e4668ff09 100644 --- a/cesar/test_general/dataplane/sparc-Makefile +++ b/cesar/test_general/dataplane/sparc-Makefile @@ -8,7 +8,7 @@ TARGET_OPTIMIZE = -Os TARGET_PROGRAMS = test_dataplane test_dataplane_SOURCES = test_dataplane.c trace_dump.c -test_dataplane_MODULES = lib hal mac cl hle \ +test_dataplane_MODULES = lib hal mac cl bufmgr bsu \ host interface \ mac/ca/test/fcall mac/common/test/fcall diff --git a/cesar/test_general/dataplane/src/test_dataplane.c b/cesar/test_general/dataplane/src/test_dataplane.c index fd881ba315..23ec012570 100644 --- a/cesar/test_general/dataplane/src/test_dataplane.c +++ b/cesar/test_general/dataplane/src/test_dataplane.c @@ -30,6 +30,7 @@ static test_dataplane_t test_dataplane_global; #if CONFIG_FCALL_MME # include "interface/interface.h" # include "interface/inc/context.h" +# include "interface/fcall/inc/context.h" # include "common/defs/spidcom.h" #endif @@ -41,10 +42,9 @@ cp_mme_recv (void *user_data, uint tei, u8 *buffer, uint length, - bool mme_recv, bool encryption) { - interface_mme_recv_done (user_data, buffer, mme_recv); + bufmgr_give_back (user_data, buffer); } /* Stub. */ @@ -173,21 +173,23 @@ test_dataplane_init (test_dataplane_t *ctx) ctx->store = mac_store_init (); ctx->pbproc = pbproc_init (&ctx->config, ctx->store); mac_ntb_init (&ctx->config); - ctx->sar = sar_init (ctx->store, ctx->pbproc, pbproc_get_ca - (ctx->pbproc), ctx->config.seed); + ipmbox_t *ipmbox = ipmbox_init (); + bufmgr_t *bufmgr = bufmgr_init (ipmbox); + ctx->sar = sar_init ( + ctx->store, ctx->pbproc, pbproc_get_ca (ctx->pbproc), + bufmgr, ctx->config.seed); sar_init_measure_context (ctx->sar, ctx); sar_init_measurement_cb (ctx->sar, ce_measurements); - ctx->cl = cl_init (ctx->store, ctx->sar, &ctx->config); - ctx->hle = hle_init (ctx->cl); + ctx->cl = cl_init (ctx->store, ctx->sar, &ctx->config, ipmbox, bufmgr); ctx->hal_timer = hal_timer_init (); /* Fcall. */ fcall_ctx_t *fcall; #if CONFIG_FCALL_MME ctx->config.sta_mac_address = SPC_OUI; - interface_t *interface = interface_init (ctx->hle, ctx->cl, ctx->sar, - &ctx->config); - interface_callback_init (interface, cp_mme_recv, cp_mme_buffer_add, - interface); + interface_t *interface = + interface_init (ctx->cl, cl_mbx_get (ctx->cl), ctx->sar, + &ctx->config, bufmgr); + interface_callback_init (interface, cp_mme_recv, interface); fcall = interface->fcall->fcall_ctx; #else /* !CONFIG_FCALL_MME */ fcall = my_station.fcall; @@ -205,7 +207,7 @@ test_dataplane_init (test_dataplane_t *ctx) ctx); fcall_register (fcall, "add_mac", test_dataplane_add_mac_fcall, ctx); /* Activate data plane (but not PBProc). */ - hle_activate (ctx->hle, true); + ipmbox_activate (ipmbox, true); sar_activate (ctx->sar, true); /* Test thread. */ cyg_thread_create (TEST_DATAPLANE_PRIORITY, &test_dataplane_thread, diff --git a/cesar/test_general/dataplane/src/trace_dump.c b/cesar/test_general/dataplane/src/trace_dump.c index 8ab9735af1..92e2c67c71 100644 --- a/cesar/test_general/dataplane/src/trace_dump.c +++ b/cesar/test_general/dataplane/src/trace_dump.c @@ -70,9 +70,6 @@ test_dataplane_trace_dump (test_dataplane_t *ctx, test_dataplane_msg_t *msg) if (m->cl) trace_buffer_dump (trace_buffer_get ("cl"), trace_buffer_dbg_dump_callback, NULL); - if (m->hle) - trace_buffer_dump (trace_buffer_get ("hle"), - trace_buffer_dbg_dump_callback, NULL); trace_bundle_stop (trace_buffer_dbg_dump_callback, NULL); } #endif /* CONFIG_TRACE */ @@ -114,8 +111,6 @@ test_dataplane_trace_dump_fcall (fcall_ctx_t *fcall, fcall_param_t **param, m->sar = false; if (!fcall_param_bind_helper ("cl", m->cl)) m->cl = false; - if (!fcall_param_bind_helper ("hle", m->hle)) - m->hle = false; } /* Message accepted, will return later. */ fcall_param_set_async (*param, 1); diff --git a/cesar/test_general/station/common/src/station.c b/cesar/test_general/station/common/src/station.c index 7a21f3d4d3..d4d39111aa 100644 --- a/cesar/test_general/station/common/src/station.c +++ b/cesar/test_general/station/common/src/station.c @@ -19,7 +19,6 @@ #include "station/station.h" #include "cp/cp.h" -#include "hle/hle.h" #include "cl/cl.h" #include "mac/sar/sar.h" #include "mac/pbproc/pbproc.h" @@ -33,6 +32,7 @@ * module. **/ #if CONFIG_FCALL_MME #include "interface/inc/context.h" +#include "interface/fcall/inc/context.h" #endif #include "cl/inc/context.h" #include "mac/pbproc/inc/context.h" diff --git a/cesar/test_general/station/compliance/Makefile.mk b/cesar/test_general/station/compliance/Makefile.mk index 2e457b34a4..1697afda62 100644 --- a/cesar/test_general/station/compliance/Makefile.mk +++ b/cesar/test_general/station/compliance/Makefile.mk @@ -1,8 +1,8 @@ TARGET_PROGRAMS= station station_SOURCES = -station_MODULES = lib mac/common mac cl hle interface cp hal station \ - host ce cp/av bsu \ +station_MODULES = lib mac/common mac cl interface cp hal station \ + host ce cp/av bsu bufmgr \ test_general/station/fcall \ test_general/station/common \ $(BOARD_MODULES) diff --git a/cesar/test_general/station/fcall/src/sta_mgr.c b/cesar/test_general/station/fcall/src/sta_mgr.c index 1c877d48ed..e08c59ddec 100644 --- a/cesar/test_general/station/fcall/src/sta_mgr.c +++ b/cesar/test_general/station/fcall/src/sta_mgr.c @@ -40,7 +40,6 @@ fc_sta_mgr_get_unassoc_sta (fcall_ctx_t *fcall, fcall_param_t **param, uint numDisSta; uint numDisNet; uint tei; - mac_t mac_address; uint is_cco; uint pco_glid; @@ -65,7 +64,6 @@ fc_sta_mgr_get_unassoc_sta (fcall_ctx_t *fcall, fcall_param_t **param, numDisSta = sta->numDisSta; numDisNet = sta->numDisNet; tei = cp_sta_get_tei (sta); - mac_address = cp_sta_get_mac_address (sta); is_cco = cp_sta_get_cco_status (sta); pco_glid = cp_sta_get_pco_glid (sta); diff --git a/cesar/test_general/station/maximus/Makefile b/cesar/test_general/station/maximus/Makefile index 82ceb3d3fc..363a11ed78 100644 --- a/cesar/test_general/station/maximus/Makefile +++ b/cesar/test_general/station/maximus/Makefile @@ -7,8 +7,8 @@ INCLUDES = test_general/station/common/override/ TARGET_PROGRAMS= sta_maximus sta_maximus_SOURCES = -sta_maximus_MODULES = lib mac/common mac cl hle interface cp hal station host \ - cp/av bsu \ +sta_maximus_MODULES = lib mac/common mac cl interface cp hal station host \ + cp/av bsu bufmgr \ test_general/station/fcall \ test_general/station/common ce/stub diff --git a/cesar/test_general/station/scenario/Makefile b/cesar/test_general/station/scenario/Makefile index 952e5a3d3e..f174bc4bdb 100644 --- a/cesar/test_general/station/scenario/Makefile +++ b/cesar/test_general/station/scenario/Makefile @@ -4,8 +4,9 @@ ECOS = y TARGET_PROGRAMS= test_scenario test_scenario_SOURCES = -test_scenario_MODULES = lib mac/common mac cl hle interface cp hal station \ - host cp/av bsu \ +test_scenario_MODULES = lib mac cl interface cp hal station \ + host cp/av bsu hal/ipmbox/maximus \ + bufmgr \ test_general/station/fcall \ test_general/station/common ce/stub diff --git a/cesar/test_general/station/scenario/py/sc15_hide.py b/cesar/test_general/station/scenario/py/sc15_hide.py index 700c7860a5..a7fee4e15c 100644 --- a/cesar/test_general/station/scenario/py/sc15_hide.py +++ b/cesar/test_general/station/scenario/py/sc15_hide.py @@ -97,7 +97,7 @@ class TestAssociationAuthentication (unittest.TestCase): scammer.CC_SET_TEI_MAP_IND_station (tei = 2, mac = sta0_mac, status = 0), ], 0) - ok = protocol.protocol_exchange_check (rsp) + ok = protocol.protocol_exchange_check (self.csi.sniffed_packets) self.failUnless (ok) if __name__ == '__main__': diff --git a/cesar/test_general/station/scenario/py/scenario_init.py b/cesar/test_general/station/scenario/py/scenario_init.py index 838eb7522f..40c333b58f 100644 --- a/cesar/test_general/station/scenario/py/scenario_init.py +++ b/cesar/test_general/station/scenario/py/scenario_init.py @@ -91,11 +91,12 @@ def sniffer (maximus, sta, mme_tx = False, mme_rx = False, beacon_tx = False, mmemax = MME () mmemax.set_msdu_attr (str (sniffer)) rsp = mmemax.sendnrecv (maximus, sta.get_sta_cesar().get(), - count = 1, filter = frame_filter_sniffer, + count = 2, filter = frame_filter_sniffer, timeout = sec_to_tck (1)) - m = Ether (rsp[0].get ()) - if m.mmtype == scammer.HPAV_MMTYPES['VS_SNIFFER_CNF']: - return m.result == scammer.HPAV_RESULT['success'] + for i in rsp: + m = Ether (i.get ()) + if m.mmtype == scammer.HPAV_MMTYPES['VS_SNIFFER_CNF']: + return m.result == scammer.HPAV_RESULT['success'] return False class HPAVProtocol: @@ -172,7 +173,7 @@ class HPAVProtocol: % (m1.pid, m2.pid) if not pmn_ok: print "PMN wrong, expected %d git %d" \ - % (m1.pmn. m2.pmn) + % (m1.pmn, m2.pmn) return peks_ok and pid_ok and pmn_ok def __protocol_exchange_check_mmes (self, m1, m2): diff --git a/cesar/test_general/station/tonemap/common-define.mk b/cesar/test_general/station/tonemap/common-define.mk index 0a56708007..cbae98997f 100644 --- a/cesar/test_general/station/tonemap/common-define.mk +++ b/cesar/test_general/station/tonemap/common-define.mk @@ -3,7 +3,7 @@ BASE = ../../.. # Common modules. tonemap_modules_common = ce \ - lib mac/common mac cl hle interface cp hal station \ - cp/av bsu \ + lib mac/common mac cl interface cp hal station \ + cp/av bsu bufmgr \ test_general/station/fcall \ test_general/station/common host -- cgit v1.2.3