meta-flow: Correctly set destination MAC in mf_set_flow_value().

[sliver-openvswitch.git] / tests / test-vconn.c

diff --git a/tests/test-vconn.c b/tests/test-vconn.c
index 4ce2f71..42940c3 100644 (file)
--- a/tests/test-vconn.c
+++ b/tests/test-vconn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include "command-line.h"
+#include "openflow/openflow.h"
 #include "poll-loop.h"
 #include "socket-util.h"
 #include "stream.h"
@@ -84,7 +85,7 @@ fpv_create(const char *type, struct fake_pvconn *fpv)
         CHECK_ERRNO(pstream_open(fpv->pvconn_name, &fpv->pstream), 0);
         free(bind_path);
     } else if (!strcmp(type, "tcp") || !strcmp(type, "ssl")) {
-        char *s, *method, *port, *save_ptr = NULL;
+        char *s, *port, *save_ptr = NULL;
         char *open_name;
 
         open_name = xasprintf("p%s:0:127.0.0.1", type);
@@ -92,7 +93,7 @@ fpv_create(const char *type, struct fake_pvconn *fpv)
 
         /* Extract bound port number from pstream name. */
         s = xstrdup(pstream_get_name(fpv->pstream));
-        method = strtok_r(s, ":", &save_ptr);
+        strtok_r(s, ":", &save_ptr);
         port = strtok_r(NULL, ":", &save_ptr);
 
         /* Save info. */
@@ -134,14 +135,16 @@ fpv_destroy(struct fake_pvconn *fpv)
 /* Connects to a fake_pvconn with vconn_open(), then closes the listener and
  * verifies that vconn_connect() reports 'expected_error'. */
 static void
-test_refuse_connection(int argc UNUSED, char *argv[])
+test_refuse_connection(int argc OVS_UNUSED, char *argv[])
 {
     const char *type = argv[1];
     int expected_error;
     struct fake_pvconn fpv;
     struct vconn *vconn;
 
-    expected_error = !strcmp(type, "unix") ? EPIPE : ECONNRESET;
+    expected_error = (!strcmp(type, "unix") ? EPIPE
+                      : !strcmp(type, "tcp") ? ECONNRESET
+                      : EPROTO);
 
     fpv_create(type, &fpv);
     CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP_VERSION, &vconn), 0);
@@ -156,7 +159,7 @@ test_refuse_connection(int argc UNUSED, char *argv[])
  * closes it immediately, and verifies that vconn_connect() reports
  * 'expected_error'. */
 static void
-test_accept_then_close(int argc UNUSED, char *argv[])
+test_accept_then_close(int argc OVS_UNUSED, char *argv[])
 {
     const char *type = argv[1];
     int expected_error;
@@ -181,7 +184,7 @@ test_accept_then_close(int argc UNUSED, char *argv[])
  * reads the hello message from it, then closes the connection and verifies
  * that vconn_connect() reports 'expected_error'. */
 static void
-test_read_hello(int argc UNUSED, char *argv[])
+test_read_hello(int argc OVS_UNUSED, char *argv[])
 {
     const char *type = argv[1];
     struct fake_pvconn fpv;
@@ -201,7 +204,7 @@ test_read_hello(int argc UNUSED, char *argv[])
        if (retval == sizeof hello) {
            CHECK(hello.version, OFP_VERSION);
            CHECK(hello.type, OFPT_HELLO);
-           CHECK(hello.length, htons(sizeof hello));
+           CHECK(ntohs(hello.length), sizeof hello);
            break;
        } else {
            CHECK_ERRNO(retval, -EAGAIN);
@@ -267,7 +270,7 @@ test_send_hello(const char *type, const void *out, size_t out_size,
            if (retval == sizeof hello) {
                CHECK(hello.version, OFP_VERSION);
                CHECK(hello.type, OFPT_HELLO);
-               CHECK(hello.length, htons(sizeof hello));
+               CHECK(ntohs(hello.length), sizeof hello);
                read_hello = true;
            } else {
                CHECK_ERRNO(retval, -EAGAIN);
@@ -310,7 +313,7 @@ test_send_hello(const char *type, const void *out, size_t out_size,
 
 /* Try connecting and sending a normal hello, which should succeed. */
 static void
-test_send_plain_hello(int argc UNUSED, char *argv[])
+test_send_plain_hello(int argc OVS_UNUSED, char *argv[])
 {
     const char *type = argv[1];
     struct ofp_header hello;
@@ -326,7 +329,7 @@ test_send_plain_hello(int argc UNUSED, char *argv[])
  * the specification says that implementations must accept and ignore extra
  * data). */
 static void
-test_send_long_hello(int argc UNUSED, char *argv[])
+test_send_long_hello(int argc OVS_UNUSED, char *argv[])
 {
     const char *type = argv[1];
     struct ofp_header hello;
@@ -344,7 +347,7 @@ test_send_long_hello(int argc UNUSED, char *argv[])
 /* Try connecting and sending an echo request instead of a hello, which should
  * fail with EPROTO. */
 static void
-test_send_echo_hello(int argc UNUSED, char *argv[])
+test_send_echo_hello(int argc OVS_UNUSED, char *argv[])
 {
     const char *type = argv[1];
     struct ofp_header echo;
@@ -359,7 +362,7 @@ test_send_echo_hello(int argc UNUSED, char *argv[])
 /* Try connecting and sending a hello packet that has its length field as 0,
  * which should fail with EPROTO. */
 static void
-test_send_short_hello(int argc UNUSED, char *argv[])
+test_send_short_hello(int argc OVS_UNUSED, char *argv[])
 {
     const char *type = argv[1];
     struct ofp_header hello;
@@ -371,7 +374,7 @@ test_send_short_hello(int argc UNUSED, char *argv[])
 /* Try connecting and sending a hello packet that has a bad version, which
  * should fail with EPROTO. */
 static void
-test_send_invalid_version_hello(int argc UNUSED, char *argv[])
+test_send_invalid_version_hello(int argc OVS_UNUSED, char *argv[])
 {
     const char *type = argv[1];
     struct ofp_header hello;
@@ -399,10 +402,8 @@ int
 main(int argc, char *argv[])
 {
     set_program_name(argv[0]);
-    time_init();
-    vlog_init();
-    vlog_set_levels(VLM_ANY_MODULE, VLF_ANY_FACILITY, VLL_EMER);
-    vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_DBG);
+    vlog_set_levels(NULL, VLF_ANY_FACILITY, VLL_EMER);
+    vlog_set_levels(NULL, VLF_CONSOLE, VLL_DBG);
     signal(SIGPIPE, SIG_IGN);
 
     time_alarm(10);