From: Justin Pettit <jpettit@nicira.com>
Date: Tue, 14 Oct 2008 07:08:05 +0000 (-0700)
Subject: Conditionally leave out a few more things if "--enable-snat" isn't used.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6a51c7a9f1951746f0792b8d7059e9405bf59014;p=sliver-openvswitch.git

Conditionally leave out a few more things if "--enable-snat" isn't used.
---

diff --git a/secchan/secchan.c b/secchan/secchan.c
index 516cfde55..084611195 100644
--- a/secchan/secchan.c
+++ b/secchan/secchan.c
@@ -198,7 +198,9 @@ static void port_watcher_set_flags(struct port_watcher *, int port_no,
                                    uint32_t config, uint32_t c_mask,
                                    uint32_t state, uint32_t s_mask);
 
+#ifdef SUPPORT_SNAT
 static struct hook snat_hook_create(struct port_watcher *pw);
+#endif
 
 static struct hook stp_hook_create(const struct settings *,
                                    struct port_watcher *,
@@ -293,7 +295,9 @@ main(int argc, char *argv[])
     /* Set up hooks. */
     hooks[n_hooks++] = port_watcher_create(local_rconn, remote_rconn, &pw);
     discovery = s.discovery ? discovery_init(&s, pw, switch_status) : NULL;
+#ifdef SUPPORT_SNAT
     hooks[n_hooks++] = snat_hook_create(pw);
+#endif
     if (s.enable_stp) {
         hooks[n_hooks++] = stp_hook_create(&s, pw, local_rconn, remote_rconn);
     }
@@ -1053,6 +1057,7 @@ port_watcher_create(struct rconn *local_rconn, struct rconn *remote_rconn,
                      port_watcher_wait_cb, pw);
 }
 
+#ifdef SUPPORT_SNAT
 struct snat_port_conf {
     struct list node;
     struct nx_snat_config config;
@@ -1300,6 +1305,7 @@ snat_hook_create(struct port_watcher *pw)
     port_watcher_register_callback(pw, snat_port_changed_cb, snat);
     return make_hook(NULL, snat_remote_packet_cb, NULL, NULL, snat);
 }
+#endif /* SUPPORT_SNAT */
 
 /* Spanning tree protocol. */
 
diff --git a/utilities/dpctl.c b/utilities/dpctl.c
index 8599a1671..40f985a23 100644
--- a/utilities/dpctl.c
+++ b/utilities/dpctl.c
@@ -222,8 +222,10 @@ usage(void)
            "  dump-flows SWITCH FLOW      print matching FLOWs\n"
            "  dump-aggregate SWITCH       print aggregate flow statistics\n"
            "  dump-aggregate SWITCH FLOW  print aggregate stats for FLOWs\n"
+#ifdef SUPPORT_SNAT
            "  add-snat SWITCH IFACE IP    add SNAT config to IFACE\n"
            "  del-snat SWITCH IFACE       delete SNAT config on IFACE\n"
+#endif
            "  add-flow SWITCH FLOW        add flow described by FLOW\n"
            "  add-flows SWITCH FILE       add flows from FILE\n"
            "  mod-flows SWITCH FLOW       modify actions of matching FLOWs\n"
@@ -617,6 +619,7 @@ str_to_action(char *str, struct ofp_action_header *actions,
             ah->type = htons(OFPAT_STRIP_VLAN);
         } else if (!strcasecmp(act, "output")) {
             port = str_to_int(arg);
+#ifdef SUPPORT_SNAT
         } else if (!strcasecmp(act, "nat")) {
             struct nx_action_snat *sa = (struct nx_action_snat *)ah;
 
@@ -633,6 +636,7 @@ str_to_action(char *str, struct ofp_action_header *actions,
             sa->vendor = htonl(NX_VENDOR_ID);
             sa->subtype = htons(NXAST_SNAT);
             sa->port = htons(str_to_int(arg));
+#endif
         } else if (!strcasecmp(act, "TABLE")) {
             port = OFPP_TABLE;
         } else if (!strcasecmp(act, "NORMAL")) {
@@ -871,6 +875,7 @@ static void do_dump_aggregate(const struct settings *s, int argc,
     dump_stats_transaction(argv[1], request);
 }
 
+#ifdef SUPPORT_SNAT
 static void do_add_snat(const struct settings *s, int argc, char *argv[])
 {
     struct vconn *vconn;
@@ -920,6 +925,7 @@ static void do_del_snat(const struct settings *s, int argc, char *argv[])
     send_openflow_buffer(vconn, buffer);
     vconn_close(vconn);
 }
+#endif /* SUPPORT_SNAT */
 
 static void do_add_flow(const struct settings *s, int argc, char *argv[])
 {
@@ -1304,8 +1310,10 @@ static struct command all_commands[] = {
     { "dump-tables", 1, 1, do_dump_tables },
     { "dump-flows", 1, 2, do_dump_flows },
     { "dump-aggregate", 1, 2, do_dump_aggregate },
+#ifdef SUPPORT_SNAT
     { "add-snat", 3, 3, do_add_snat },
     { "del-snat", 2, 2, do_del_snat },
+#endif
     { "add-flow", 2, 2, do_add_flow },
     { "add-flows", 2, 2, do_add_flows },
     { "mod-flows", 2, 2, do_mod_flows },