From d1824930e9c9011c84f162db71d1ed649e14a6d1 Mon Sep 17 00:00:00 2001

From: Gargi Sharma <gs051095@gmail.com>

Date: Tue, 28 Mar 2017 19:42:39 +0530

Subject: [PATCH] ebtables: extensions: Constify option struct

The struct  of the type option is only used to initialise a field

inside the ebt_u_watcher or ebt_u_target or ebt_u_match struct and

is not modified anywhere.

Signed-off-by: Gargi Sharma <gs051095@gmail.com>

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Signed-off-by: Phil Sutter <psutter@redhat.com>

---

 extensions/ebt_802_3.c    | 2 +-

 extensions/ebt_among.c    | 2 +-

 extensions/ebt_arp.c      | 2 +-

 extensions/ebt_arpreply.c | 2 +-

 extensions/ebt_ip.c       | 2 +-

 extensions/ebt_limit.c    | 2 +-

 extensions/ebt_log.c      | 2 +-

 extensions/ebt_mark.c     | 2 +-

 extensions/ebt_mark_m.c   | 2 +-

 extensions/ebt_nat.c      | 4 ++--

 extensions/ebt_nflog.c    | 2 +-

 extensions/ebt_pkttype.c  | 2 +-

 extensions/ebt_redirect.c | 2 +-

 extensions/ebt_standard.c | 2 +-

 extensions/ebt_stp.c      | 2 +-

 extensions/ebt_ulog.c     | 2 +-

 extensions/ebt_vlan.c     | 2 +-

 17 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/extensions/ebt_802_3.c b/extensions/ebt_802_3.c

index dd22eb2605334..458484939231d 100644

--- a/extensions/ebt_802_3.c

+++ b/extensions/ebt_802_3.c

@@ -17,7 +17,7 @@

 #define _802_3_SAP '1'

 #define _802_3_TYPE '2'

-static struct option opts[] =

+static const struct option opts[] =

 {

 	{ "802_3-sap"   , required_argument, 0, _802_3_SAP },

 	{ "802_3-type"  , required_argument, 0, _802_3_TYPE },

diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c

index f97d07ec118ed..e4fc5ac22a005 100644

--- a/extensions/ebt_among.c

+++ b/extensions/ebt_among.c

@@ -26,7 +26,7 @@

 #define AMONG_DST_F '3'

 #define AMONG_SRC_F '4'

-static struct option opts[] = {

+static const struct option opts[] = {

 	{"among-dst", required_argument, 0, AMONG_DST},

 	{"among-src", required_argument, 0, AMONG_SRC},

 	{"among-dst-file", required_argument, 0, AMONG_DST_F},

diff --git a/extensions/ebt_arp.c b/extensions/ebt_arp.c

index 64d337d5967cf..b2819553ab313 100644

--- a/extensions/ebt_arp.c

+++ b/extensions/ebt_arp.c

@@ -24,7 +24,7 @@

 #define ARP_MAC_S  '6'

 #define ARP_MAC_D  '7'

 #define ARP_GRAT   '8'

-static struct option opts[] =

+static const struct option opts[] =

 {

 	{ "arp-opcode"    , required_argument, 0, ARP_OPCODE },

 	{ "arp-op"        , required_argument, 0, ARP_OPCODE },

diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c

index c3757f389ba23..51eda66adbff3 100644

--- a/extensions/ebt_arpreply.c

+++ b/extensions/ebt_arpreply.c

@@ -19,7 +19,7 @@ static int mac_supplied;

 #define REPLY_MAC '1'

 #define REPLY_TARGET '2'

-static struct option opts[] =

+static const struct option opts[] =

 {

 	{ "arpreply-mac" ,    required_argument, 0, REPLY_MAC    },

 	{ "arpreply-target" , required_argument, 0, REPLY_TARGET },

diff --git a/extensions/ebt_ip.c b/extensions/ebt_ip.c

index 4e0b7f0780302..59559feffa50b 100644

--- a/extensions/ebt_ip.c

+++ b/extensions/ebt_ip.c

@@ -25,7 +25,7 @@

 #define IP_SPORT  '5'

 #define IP_DPORT  '6'

-static struct option opts[] =

+static const struct option opts[] =

 {

 	{ "ip-source"           , required_argument, 0, IP_SOURCE },

 	{ "ip-src"              , required_argument, 0, IP_SOURCE },

diff --git a/extensions/ebt_limit.c b/extensions/ebt_limit.c

index d189a09aa7cab..2cbf4dee51fb4 100644

--- a/extensions/ebt_limit.c

+++ b/extensions/ebt_limit.c

@@ -41,7 +41,7 @@ static int string_to_number(const char *s, unsigned int min, unsigned int max,

 #define ARG_LIMIT		'1'

 #define ARG_LIMIT_BURST		'2'

-static struct option opts[] =

+static const struct option opts[] =

 {

 	{ "limit",		required_argument, 0, ARG_LIMIT },

 	{ "limit-burst",	required_argument, 0, ARG_LIMIT_BURST },

diff --git a/extensions/ebt_log.c b/extensions/ebt_log.c

index 1cf831a7ec17a..97d50919d25ca 100644

--- a/extensions/ebt_log.c

+++ b/extensions/ebt_log.c

@@ -61,7 +61,7 @@ static int name_to_loglevel(char* arg)

 #define LOG_IP     '4'

 #define LOG_LOG    '5'

 #define LOG_IP6    '6'

-static struct option opts[] =

+static const struct option opts[] =

 {

 	{ "log-prefix", required_argument, 0, LOG_PREFIX },

 	{ "log-level" , required_argument, 0, LOG_LEVEL  },

diff --git a/extensions/ebt_mark.c b/extensions/ebt_mark.c

index 5776b1cb24509..4cf1378d5085c 100644

--- a/extensions/ebt_mark.c

+++ b/extensions/ebt_mark.c

@@ -20,7 +20,7 @@ static int mark_supplied;

 #define MARK_ORMARK  '3'

 #define MARK_ANDMARK '4'

 #define MARK_XORMARK '5'

-static struct option opts[] =

+static const struct option opts[] =

 {

 	{ "mark-target" , required_argument, 0, MARK_TARGET },

 	/* an oldtime messup, we should have always used the scheme

diff --git a/extensions/ebt_mark_m.c b/extensions/ebt_mark_m.c

index 2a259b04368d0..7561f059c0108 100644

--- a/extensions/ebt_mark_m.c

+++ b/extensions/ebt_mark_m.c

@@ -15,7 +15,7 @@

 #define MARK '1'

-static struct option opts[] =

+static const struct option opts[] =

 {

 	{ "mark", required_argument, 0, MARK },

 	{ 0 }

diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c

index e6afbf8f3a3f8..00d9cd4083247 100644

--- a/extensions/ebt_nat.c

+++ b/extensions/ebt_nat.c

@@ -21,7 +21,7 @@ static int to_source_supplied, to_dest_supplied;

 #define NAT_S_TARGET '2'

 #define NAT_D_TARGET '2'

 #define NAT_S_ARP '3'

-static struct option opts_s[] =

+static const struct option opts_s[] =

 {

 	{ "to-source"     , required_argument, 0, NAT_S },

 	{ "to-src"        , required_argument, 0, NAT_S },

@@ -30,7 +30,7 @@ static struct option opts_s[] =

 	{ 0 }

 };

-static struct option opts_d[] =

+static const struct option opts_d[] =

 {

 	{ "to-destination", required_argument, 0, NAT_D },

 	{ "to-dst"        , required_argument, 0, NAT_D },

diff --git a/extensions/ebt_nflog.c b/extensions/ebt_nflog.c

index 0cd10e05f1c33..405673a01f893 100644

--- a/extensions/ebt_nflog.c

+++ b/extensions/ebt_nflog.c

@@ -25,7 +25,7 @@ enum {

 	NFLOG_NFLOG = 0x16,

 };

-static struct option nflog_opts[] = {

+static const struct option nflog_opts[] = {

 	{"nflog-group", required_argument, NULL, NFLOG_GROUP},

 	{"nflog-prefix", required_argument, NULL, NFLOG_PREFIX},

 	{"nflog-range", required_argument, NULL, NFLOG_RANGE},

diff --git a/extensions/ebt_pkttype.c b/extensions/ebt_pkttype.c

index 5b5cb0398d559..486c85c3c3faf 100644

--- a/extensions/ebt_pkttype.c

+++ b/extensions/ebt_pkttype.c

@@ -27,7 +27,7 @@ char *classes[] =

 	"\0"

 };

-static struct option opts[] =

+static const struct option opts[] =

 {

 	{ "pkttype-type"        , required_argument, 0, '1' },

 	{ 0 }

diff --git a/extensions/ebt_redirect.c b/extensions/ebt_redirect.c

index e47081894317c..3f8227a917583 100644

--- a/extensions/ebt_redirect.c

+++ b/extensions/ebt_redirect.c

@@ -14,7 +14,7 @@

 #include <linux/netfilter_bridge/ebt_redirect.h>

 #define REDIRECT_TARGET '1'

-static struct option opts[] =

+static const struct option opts[] =

 {

 	{ "redirect-target", required_argument, 0, REDIRECT_TARGET },

 	{ 0 }

diff --git a/extensions/ebt_standard.c b/extensions/ebt_standard.c

index 67d4d7cc7046b..81edead71a840 100644

--- a/extensions/ebt_standard.c

+++ b/extensions/ebt_standard.c

@@ -11,7 +11,7 @@

 #include <getopt.h>

 #include "../include/ebtables_u.h"

-static struct option opts[] =

+static const struct option opts[] =

 {

 	{0}

 };

diff --git a/extensions/ebt_stp.c b/extensions/ebt_stp.c

index 2b108a707fe65..5c5fc3334311d 100644

--- a/extensions/ebt_stp.c

+++ b/extensions/ebt_stp.c

@@ -27,7 +27,7 @@

 #define STP_FWDD	'l'

 #define STP_NUMOPS 12

-static struct option opts[] =

+static const struct option opts[] =

 {

 	{ "stp-type"         , required_argument, 0, STP_TYPE},

 	{ "stp-flags"        , required_argument, 0, STP_FLAGS},

diff --git a/extensions/ebt_ulog.c b/extensions/ebt_ulog.c

index 162586d7a4c35..54eec53f7069f 100644

--- a/extensions/ebt_ulog.c

+++ b/extensions/ebt_ulog.c

@@ -24,7 +24,7 @@

 #define ULOG_CPRANGE    '3'

 #define ULOG_QTHRESHOLD '4'

 #define ULOG_ULOG       '5'

-static struct option opts[] =

+static const struct option opts[] =

 {

 	{ "ulog-prefix"    , required_argument, 0, ULOG_PREFIX     },

 	{ "ulog-nlgroup"   , required_argument, 0, ULOG_NLGROUP    },

diff --git a/extensions/ebt_vlan.c b/extensions/ebt_vlan.c

index 6714c82d4d1ac..0a37067b5ebde 100644

--- a/extensions/ebt_vlan.c

+++ b/extensions/ebt_vlan.c

@@ -25,7 +25,7 @@

 #define VLAN_PRIO  '2'

 #define VLAN_ENCAP '3'

-static struct option opts[] = {

+static const struct option opts[] = {

 	{"vlan-id"   , required_argument, NULL, VLAN_ID},

 	{"vlan-prio" , required_argument, NULL, VLAN_PRIO},

 	{"vlan-encap", required_argument, NULL, VLAN_ENCAP},

-- 

2.21.0