summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlaranjeiro2010-04-21 08:18:30 +0000
committerlaranjeiro2010-04-21 08:18:30 +0000
commit7772dbdf6eba8df288f50f67f5bebf040fb76f52 (patch)
tree730b93a83e402394ef71fb08825987b552e98bc0
parent1c08a3b5384688c44c054d67ab520f1fb1e0247b (diff)
cesar/interface: fix the VS_SNFIFER_CNF result, closes #1480
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@6942 017c9cb6-072f-447c-8318-d5b54f68fe89
-rw-r--r--cesar/interface/sniffer/sniffer.h6
-rw-r--r--cesar/interface/sniffer/src/sniffer.c2
-rw-r--r--cesar/interface/sniffer/test/src/test-sniffer.c22
-rw-r--r--cesar/interface/src/interface.c1
-rw-r--r--cesar/interface/test/src/test-interface.c8
5 files changed, 22 insertions, 17 deletions
diff --git a/cesar/interface/sniffer/sniffer.h b/cesar/interface/sniffer/sniffer.h
index 31b57d43fa..f2438075a5 100644
--- a/cesar/interface/sniffer/sniffer.h
+++ b/cesar/interface/sniffer/sniffer.h
@@ -34,6 +34,12 @@ enum
INTERFACE_SNIFFER_TYPE_NB
};
+enum interface_sniffer_cnf_result_t
+{
+ INTERFACE_SNIFFER_CNF_RESULT_SUCCESS,
+ INTERFACE_SNIFFER_CNF_RESULT_FAILURE,
+ INTERFACE_SNIFFER_CNF_RESULT_NB
+};
/** Send a message to the interface. This message shall be send to the linux driver.
* \param user_data the data provided in the function registration
diff --git a/cesar/interface/sniffer/src/sniffer.c b/cesar/interface/sniffer/src/sniffer.c
index f9b9dc46b5..76709ae27f 100644
--- a/cesar/interface/sniffer/src/sniffer.c
+++ b/cesar/interface/sniffer/src/sniffer.c
@@ -308,7 +308,7 @@ interface_sniffer_configure_and_respond (interface_sniffer_t *ctx, u8 *buffer,
bitstream_write (&stream, VS_SNIFFER_CNF, 16);
bitstream_write (&stream, 0, 16);
bitstream_write (&stream, SPC_OUI, OUI_SIZE_BITS);
- bitstream_write (&stream, ok && (data == interface_sniffer_status (ctx)),
+ bitstream_write (&stream, !(ok && (data == interface_sniffer_status (ctx))),
8);
bitstream_write (&stream, interface_sniffer_status (ctx), 8);
bitstream_write_large (&stream, ctx->da, 48);
diff --git a/cesar/interface/sniffer/test/src/test-sniffer.c b/cesar/interface/sniffer/test/src/test-sniffer.c
index 6c1f5ac015..565f376c80 100644
--- a/cesar/interface/sniffer/test/src/test-sniffer.c
+++ b/cesar/interface/sniffer/test/src/test-sniffer.c
@@ -123,7 +123,7 @@ test_sniffer_configure (test_t test)
test_sniffer_read_answer (&oda, &result, &status, &da);
test_fail_unless (oda == OSA1);
- test_fail_unless (result == true);
+ test_fail_unless (result == INTERFACE_SNIFFER_CNF_RESULT_SUCCESS);
test_fail_unless (status == 0xF);
test_fail_unless (interface_sniffer_status (&sniffer) == status);
test_fail_unless (OSA1 == da);
@@ -144,7 +144,7 @@ test_sniffer_configure (test_t test)
test_sniffer_read_answer (&oda, &result, &status, &da);
test_fail_unless (oda == OSA1);
- test_fail_unless (result == true);
+ test_fail_unless (result == INTERFACE_SNIFFER_CNF_RESULT_SUCCESS);
test_fail_unless (status == false);
test_fail_unless (interface_sniffer_status (&sniffer) == status);
test_fail_unless (da == OSA1);
@@ -166,7 +166,7 @@ test_sniffer_configure (test_t test)
test_sniffer_read_answer (&oda, &result, &status, &da);
test_fail_unless (oda == OSA1);
- test_fail_unless (result == true);
+ test_fail_unless (result == INTERFACE_SNIFFER_CNF_RESULT_SUCCESS);
test_fail_unless (status == 0x1);
test_fail_unless (interface_sniffer_status (&sniffer) == status);
test_fail_unless (da == OSA1);
@@ -188,7 +188,7 @@ test_sniffer_configure (test_t test)
test_sniffer_read_answer (&oda, &result, &status, &da);
test_fail_unless (oda == OSA1);
- test_fail_unless (result == true);
+ test_fail_unless (result == INTERFACE_SNIFFER_CNF_RESULT_SUCCESS);
test_fail_unless (status == 0x2);
test_fail_unless (interface_sniffer_status (&sniffer) == status);
test_fail_unless (da == OSA1);
@@ -210,7 +210,7 @@ test_sniffer_configure (test_t test)
test_sniffer_read_answer (&oda, &result, &status, &da);
test_fail_unless (oda == OSA1);
- test_fail_unless (result == true);
+ test_fail_unless (result == INTERFACE_SNIFFER_CNF_RESULT_SUCCESS);
test_fail_unless (status == 0x4);
test_fail_unless (interface_sniffer_status (&sniffer) == status);
test_fail_unless (da == OSA1);
@@ -232,7 +232,7 @@ test_sniffer_configure (test_t test)
test_sniffer_read_answer (&oda, &result, &status, &da);
test_fail_unless (oda == OSA1);
- test_fail_unless (result == true);
+ test_fail_unless (result == INTERFACE_SNIFFER_CNF_RESULT_SUCCESS);
test_fail_unless (status == 0x8);
test_fail_unless (interface_sniffer_status (&sniffer) == status);
test_fail_unless (da == OSA1);
@@ -254,7 +254,7 @@ test_sniffer_configure (test_t test)
test_sniffer_read_answer (&oda, &result, &status, &da);
test_fail_unless (oda == OSA2);
- test_fail_unless (result == false);
+ test_fail_unless (result == INTERFACE_SNIFFER_CNF_RESULT_FAILURE);
test_fail_unless (status == 0x8);
test_fail_unless (interface_sniffer_status (&sniffer) == status);
test_fail_unless (da == OSA1);
@@ -276,7 +276,7 @@ test_sniffer_configure (test_t test)
test_sniffer_read_answer (&oda, &result, &status, &da);
test_fail_unless (oda == OSA2);
- test_fail_unless (result == true);
+ test_fail_unless (result == INTERFACE_SNIFFER_CNF_RESULT_SUCCESS);
test_fail_unless (status == 0x0);
test_fail_unless (interface_sniffer_status (&sniffer) == status);
test_fail_unless (da == OSA2);
@@ -298,7 +298,7 @@ test_sniffer_configure (test_t test)
test_sniffer_read_answer (&oda, &result, &status, &da);
test_fail_unless (oda == OSA2);
- test_fail_unless (result == true);
+ test_fail_unless (result == INTERFACE_SNIFFER_CNF_RESULT_SUCCESS);
test_fail_unless (status == 0xF);
test_fail_unless (interface_sniffer_status (&sniffer) == status);
test_fail_unless (da == OSA2);
@@ -319,7 +319,7 @@ test_sniffer_configure (test_t test)
test_sniffer_read_answer (&oda, &result, &status, &da);
test_fail_unless (oda == OSA2);
- test_fail_unless (result == true);
+ test_fail_unless (result == INTERFACE_SNIFFER_CNF_RESULT_SUCCESS);
test_fail_unless (status == 0x0);
test_fail_unless (interface_sniffer_status (&sniffer) == status);
test_fail_unless (da == OSA2);
@@ -339,7 +339,7 @@ test_sniffer_configure (test_t test)
test_sniffer_read_answer (&oda, &result, &status, &da);
test_fail_unless (oda == OSA2);
- test_fail_unless (result == true);
+ test_fail_unless (result == INTERFACE_SNIFFER_CNF_RESULT_SUCCESS);
test_fail_unless (status == 0xF);
test_fail_unless (interface_sniffer_status (&sniffer) == status);
test_fail_unless (da == OSA2);
diff --git a/cesar/interface/src/interface.c b/cesar/interface/src/interface.c
index a64dcd809b..6629dfcde2 100644
--- a/cesar/interface/src/interface.c
+++ b/cesar/interface/src/interface.c
@@ -31,7 +31,6 @@
# include "interface/fcall/inc/interface_fcall.h"
#endif
-
static interface_t interface_global;
#ifndef INTERFACE_UNIT_TEST
diff --git a/cesar/interface/test/src/test-interface.c b/cesar/interface/test/src/test-interface.c
index 3a6e7d9050..0937e276e7 100644
--- a/cesar/interface/test/src/test-interface.c
+++ b/cesar/interface/test/src/test-interface.c
@@ -129,7 +129,7 @@ test_configure_sniffer (test_t test)
test_sniffer_read_answer (&oda, &res, &status, &da);
test_fail_unless (oda == OSA1);
- test_fail_unless (res == true);
+ test_fail_unless (res == INTERFACE_SNIFFER_CNF_RESULT_SUCCESS);
test_fail_unless (status == i);
test_fail_unless (da == OSA1);
}
@@ -152,7 +152,7 @@ test_configure_sniffer (test_t test)
test_sniffer_read_answer (&oda, &res, &status, &da);
test_fail_unless (oda == OSA2);
- test_fail_unless (res == false);
+ test_fail_unless (res == INTERFACE_SNIFFER_CNF_RESULT_FAILURE);
test_fail_unless (status == interface_sniffer_status
(interface->sniffer));
test_fail_unless (da == OSA1);
@@ -173,7 +173,7 @@ test_configure_sniffer (test_t test)
test_sniffer_read_answer (&oda, &res, &status, &da);
test_fail_unless (oda == OSA2);
- test_fail_unless (res == true);
+ test_fail_unless (res == INTERFACE_SNIFFER_CNF_RESULT_SUCCESS);
test_fail_unless (status == interface_sniffer_status
(interface->sniffer));
test_fail_unless (da == OSA2);
@@ -194,7 +194,7 @@ test_configure_sniffer (test_t test)
test_sniffer_read_answer (&oda, &res, &status, &da);
test_fail_unless (oda == OSA2);
- test_fail_unless (res == true);
+ test_fail_unless (res == INTERFACE_SNIFFER_CNF_RESULT_SUCCESS);
test_fail_unless (status == interface_sniffer_status
(interface->sniffer));
test_fail_unless (da == OSA2);