pass idby argument to all functions

diff --git a/bitrate.c b/bitrate.c
index 22b863e21258ee64d80cee0bb9e0dc74d3fd4772..4da246f5ce79721e4cbc775fc3ea7e28ce0d045d 100644 (file)
--- a/bitrate.c
+++ b/bitrate.c
@@ -7,7 +7,8 @@
 static int handle_bitrates(struct nl80211_state *state,
                           struct nl_cb *cb,
                           struct nl_msg *msg,
-                          int argc, char **argv)
+                          int argc, char **argv,
+                          enum id_input id)
 {
        struct nlattr *nl_rates, *nl_band;
        int i;

diff --git a/connect.c b/connect.c
index 1af4e0dcd65beab1b33d38603ec607c497b85c89..a58e44e5ba76142e35bce071cd4d84aba4cdceb2 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -10,7 +10,8 @@
 #include "iw.h"
 
 static int iw_conn(struct nl80211_state *state, struct nl_cb *cb,
-                  struct nl_msg *msg, int argc, char **argv)
+                  struct nl_msg *msg, int argc, char **argv,
+                  enum id_input id)
 {
        char *end;
        unsigned char bssid[6];
@@ -60,7 +61,8 @@ static int iw_conn(struct nl80211_state *state, struct nl_cb *cb,
 static int disconnect(struct nl80211_state *state,
                      struct nl_cb *cb,
                      struct nl_msg *msg,
-                     int argc, char **argv)
+                     int argc, char **argv,
+                     enum id_input id)
 {
        return 0;
 }
@@ -69,7 +71,8 @@ TOPLEVEL(disconnect, NULL,
        "Disconnect from the current network.");
 
 static int iw_connect(struct nl80211_state *state, struct nl_cb *cb,
-                     struct nl_msg *msg, int argc, char **argv)
+                     struct nl_msg *msg, int argc, char **argv,
+                     enum id_input id)
 {
        char **conn_argv, *dev = argv[0];
        static const __u32 cmds[] = {

diff --git a/cqm.c b/cqm.c
index 3da2b5465cce0d4e352f608f790fde4661336bc7..65876afadd13000ae7705633fea9c1b13c58e14c 100644 (file)
--- a/cqm.c
+++ b/cqm.c
@@ -10,7 +10,8 @@
 #include "iw.h"
 
 static int iw_cqm_rssi(struct nl80211_state *state, struct nl_cb *cb,
-                      struct nl_msg *msg, int argc, char **argv)
+                      struct nl_msg *msg, int argc, char **argv,
+                      enum id_input id)
 {
        struct nl_msg *cqm = NULL;
        int thold = 0;

diff --git a/event.c b/event.c
index bc3966224baf4216a42e2549d332db47e1bef6d6..f9c5d264d700919fe243ad797842882149d657e1 100644 (file)
--- a/event.c
+++ b/event.c
@@ -552,7 +552,8 @@ __u32 listen_events(struct nl80211_state *state,
 static int print_events(struct nl80211_state *state,
                        struct nl_cb *cb,
                        struct nl_msg *msg,
-                       int argc, char **argv)
+                       int argc, char **argv,
+                       enum id_input id)
 {
        struct print_event_args args;
        int ret;

diff --git a/hwsim.c b/hwsim.c
index 188c1cbbfb58b0f7ecbf32fb3ece4df6e0ccdfcc..08c9c2e62ee3825d9cea25ff17edf70c9b80b53a 100644 (file)
--- a/hwsim.c
+++ b/hwsim.c
@@ -53,7 +53,8 @@ static int print_hwsim_ps_handler(struct nl_msg *msg, void *arg)
 }
 
 static int handle_hwsim_getps(struct nl80211_state *state, struct nl_cb *cb,
-                             struct nl_msg *msg, int argc, char **argv)
+                             struct nl_msg *msg, int argc, char **argv,
+                             enum id_input id)
 {
        struct nlattr *tmdata;
 
@@ -74,7 +75,8 @@ static int handle_hwsim_getps(struct nl80211_state *state, struct nl_cb *cb,
 COMMAND(hwsim, getps, "", NL80211_CMD_TESTMODE, 0, CIB_PHY, handle_hwsim_getps, "");
 
 static int handle_hwsim_setps(struct nl80211_state *state, struct nl_cb *cb,
-                             struct nl_msg *msg, int argc, char **argv)
+                             struct nl_msg *msg, int argc, char **argv,
+                             enum id_input id)
 {
        struct nlattr *tmdata;
        __u32 ps;
@@ -105,7 +107,8 @@ static int handle_hwsim_setps(struct nl80211_state *state, struct nl_cb *cb,
 COMMAND(hwsim, setps, "<value>", NL80211_CMD_TESTMODE, 0, CIB_PHY, handle_hwsim_setps, "");
 
 static int handle_hwsim_stop_queues(struct nl80211_state *state, struct nl_cb *cb,
-                                   struct nl_msg *msg, int argc, char **argv)
+                                   struct nl_msg *msg, int argc, char **argv,
+                                   enum id_input id)
 {
        struct nlattr *tmdata;
 
@@ -126,7 +129,8 @@ static int handle_hwsim_stop_queues(struct nl80211_state *state, struct nl_cb *c
 COMMAND(hwsim, stopqueues, "", NL80211_CMD_TESTMODE, 0, CIB_PHY, handle_hwsim_stop_queues, "");
 
 static int handle_hwsim_wake_queues(struct nl80211_state *state, struct nl_cb *cb,
-                                   struct nl_msg *msg, int argc, char **argv)
+                                   struct nl_msg *msg, int argc, char **argv,
+                                   enum id_input id)
 {
        struct nlattr *tmdata;
 

diff --git a/ibss.c b/ibss.c
index 62a11106615f33d6d48abc73c5bd3e8ecaea4086..955446e445dddf1563cdeb9e901ac98edde905f6 100644 (file)
--- a/ibss.c
+++ b/ibss.c
@@ -19,7 +19,8 @@ SECTION(ibss);
 static int join_ibss(struct nl80211_state *state,
                     struct nl_cb *cb,
                     struct nl_msg *msg,
-                    int argc, char **argv)
+                    int argc, char **argv,
+                    enum id_input id)
 {
        char *end;
        unsigned char abssid[6];
@@ -154,7 +155,8 @@ static int join_ibss(struct nl80211_state *state,
 static int leave_ibss(struct nl80211_state *state,
                      struct nl_cb *cb,
                      struct nl_msg *msg,
-                     int argc, char **argv)
+                     int argc, char **argv,
+                     enum id_input id)
 {
        return 0;
 }

diff --git a/info.c b/info.c
index 50a90736f6bdf7e983463125d10231cf6a63ffaf..f039bba04981f348d4ef359d9bd1f4681fb3c0d2 100644 (file)
--- a/info.c
+++ b/info.c
@@ -446,7 +446,8 @@ broken_combination:
 static int handle_info(struct nl80211_state *state,
                       struct nl_cb *cb,
                       struct nl_msg *msg,
-                      int argc, char **argv)
+                      int argc, char **argv,
+                      enum id_input id)
 {
        nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_phy_handler, NULL);
 

diff --git a/interface.c b/interface.c
index 9b086270d66d1ed051cafca3eefb4bf35f914645..945362f90ab4d86ec0bf4af17edd9d1568c147e6 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -159,7 +159,8 @@ nla_put_failure:
 static int handle_interface_add(struct nl80211_state *state,
                                struct nl_cb *cb,
                                struct nl_msg *msg,
-                               int argc, char **argv)
+                               int argc, char **argv,
+                               enum id_input id)
 {
        char *name;
        char *mesh_id = NULL;
@@ -233,7 +234,8 @@ COMMAND(interface, add, "<name> type <type> [mesh_id <meshid>] [4addr on|off] [f
 static int handle_interface_del(struct nl80211_state *state,
                                struct nl_cb *cb,
                                struct nl_msg *msg,
-                               int argc, char **argv)
+                               int argc, char **argv,
+                               enum id_input id)
 {
        return 0;
 }
@@ -311,7 +313,8 @@ static int print_iface_handler(struct nl_msg *msg, void *arg)
 static int handle_interface_info(struct nl80211_state *state,
                                 struct nl_cb *cb,
                                 struct nl_msg *msg,
-                                int argc, char **argv)
+                                int argc, char **argv,
+                                enum id_input id)
 {
        nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_iface_handler, NULL);
        return 0;
@@ -322,7 +325,8 @@ TOPLEVEL(info, NULL, NL80211_CMD_GET_INTERFACE, 0, CIB_NETDEV, handle_interface_
 static int handle_interface_set(struct nl80211_state *state,
                                struct nl_cb *cb,
                                struct nl_msg *msg,
-                               int argc, char **argv)
+                               int argc, char **argv,
+                               enum id_input id)
 {
        if (!argc)
                return 1;
@@ -352,7 +356,8 @@ COMMAND(set, monitor, "<flag>*",
 static int handle_interface_meshid(struct nl80211_state *state,
                                   struct nl_cb *cb,
                                   struct nl_msg *msg,
-                                  int argc, char **argv)
+                                  int argc, char **argv,
+                                  enum id_input id)
 {
        char *mesh_id = NULL;
 
@@ -375,7 +380,8 @@ static unsigned int dev_dump_wiphy;
 static int handle_dev_dump(struct nl80211_state *state,
                           struct nl_cb *cb,
                           struct nl_msg *msg,
-                          int argc, char **argv)
+                          int argc, char **argv,
+                          enum id_input id)
 {
        dev_dump_wiphy = -1;
        nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_iface_handler, &dev_dump_wiphy);
@@ -387,7 +393,8 @@ TOPLEVEL(dev, NULL, NL80211_CMD_GET_INTERFACE, NLM_F_DUMP, CIB_NONE, handle_dev_
 static int handle_interface_type(struct nl80211_state *state,
                                 struct nl_cb *cb,
                                 struct nl_msg *msg,
-                                int argc, char **argv)
+                                int argc, char **argv,
+                                enum id_input id)
 {
        enum nl80211_iftype type;
        int tpset;
@@ -411,9 +418,10 @@ COMMAND(set, type, "<type>",
        IFACE_TYPES);
 
 static int handle_interface_4addr(struct nl80211_state *state,
-                                struct nl_cb *cb,
-                                struct nl_msg *msg,
-                                int argc, char **argv)
+                                 struct nl_cb *cb,
+                                 struct nl_msg *msg,
+                                 int argc, char **argv,
+                                 enum id_input id)
 {
        if (argc != 1)
                return 1;
@@ -426,7 +434,8 @@ COMMAND(set, 4addr, "<on|off>",
 static int handle_interface_noack_map(struct nl80211_state *state,
                                      struct nl_cb *cb,
                                      struct nl_msg *msg,
-                                     int argc, char **argv)
+                                     int argc, char **argv,
+                                     enum id_input id)
 {
        uint16_t noack_map;
        char *end;
@@ -453,7 +462,8 @@ COMMAND(set, noack_map, "<map>",
 static int handle_interface_wds_peer(struct nl80211_state *state,
                                     struct nl_cb *cb,
                                     struct nl_msg *msg,
-                                    int argc, char **argv)
+                                    int argc, char **argv,
+                                    enum id_input id)
 {
        unsigned char mac_addr[ETH_ALEN];
 

diff --git a/iw.c b/iw.c
index cdfd00e4b915a10ee79e608a10eaaf550a4fd3d5..98c0852153c02635cf9b85cf65bc7cbb0c76e881 100644 (file)
--- a/iw.c
+++ b/iw.c
@@ -189,7 +189,8 @@ static void usage(int argc, char **argv)
 static int print_help(struct nl80211_state *state,
                      struct nl_cb *cb,
                      struct nl_msg *msg,
-                     int argc, char **argv)
+                     int argc, char **argv,
+                     enum id_input id)
 {
        exit(3);
 }
@@ -375,7 +376,7 @@ static int __handle_cmd(struct nl80211_state *state, enum id_input idby,
        if (!cmd->cmd) {
                argc = o_argc;
                argv = o_argv;
-               return cmd->handler(state, NULL, NULL, argc, argv);
+               return cmd->handler(state, NULL, NULL, argc, argv, idby);
        }
 
        msg = nlmsg_alloc();
@@ -409,7 +410,7 @@ static int __handle_cmd(struct nl80211_state *state, enum id_input idby,
                break;
        }
 
-       err = cmd->handler(state, cb, msg, argc, argv);
+       err = cmd->handler(state, cb, msg, argc, argv, idby);
        if (err)
                goto out;
 

diff --git a/iw.h b/iw.h
index 1d7c4ea19077dee6c8bc48cffe49f0b33911da58..54ecbc3d584a3d6732c8435f29e5cfd10033c3c6 100644 (file)
--- a/iw.h
+++ b/iw.h
@@ -54,7 +54,8 @@ struct cmd {
        int (*handler)(struct nl80211_state *state,
                       struct nl_cb *cb,
                       struct nl_msg *msg,
-                      int argc, char **argv);
+                      int argc, char **argv,
+                      enum id_input id);
        const struct cmd *(*selector)(int argc, char **argv);
        const struct cmd *parent;
 };

diff --git a/link.c b/link.c
index eb27de2f2ddabd510c1f05ca52b1fc8230040ff6..6a803a137f1790858f3db4f1c257286720b6c6b9 100644 (file)
--- a/link.c
+++ b/link.c
@@ -100,7 +100,8 @@ static int link_bss_handler(struct nl_msg *msg, void *arg)
 static int handle_scan_for_link(struct nl80211_state *state,
                                struct nl_cb *cb,
                                struct nl_msg *msg,
-                               int argc, char **argv)
+                               int argc, char **argv,
+                               enum id_input id)
 {
        if (argc > 0)
                return 1;
@@ -226,7 +227,8 @@ static int print_link_sta(struct nl_msg *msg, void *arg)
 static int handle_link_sta(struct nl80211_state *state,
                           struct nl_cb *cb,
                           struct nl_msg *msg,
-                          int argc, char **argv)
+                          int argc, char **argv,
+                          enum id_input id)
 {
        unsigned char mac_addr[ETH_ALEN];
 
@@ -254,7 +256,8 @@ static int handle_link_sta(struct nl80211_state *state,
 }
 
 static int handle_link(struct nl80211_state *state, struct nl_cb *cb,
-                      struct nl_msg *msg, int argc, char **argv)
+                      struct nl_msg *msg, int argc, char **argv,
+                      enum id_input id)
 {
        char *link_argv[] = {
                NULL,

diff --git a/mesh.c b/mesh.c
index 7b7efe85623138711130b0fed8ac537539be532e..3077abf72b621b5134012231cd61c6da11dba00f 100644 (file)
--- a/mesh.c
+++ b/mesh.c
@@ -251,7 +251,8 @@ static const struct mesh_param_descr *find_mesh_param(const char *name)
 static int set_interface_meshparam(struct nl80211_state *state,
                                   struct nl_cb *cb,
                                   struct nl_msg *msg,
-                                  int argc, char **argv)
+                                  int argc, char **argv,
+                                  enum id_input id)
 {
        const struct mesh_param_descr *mdescr;
        struct nlattr *container;
@@ -357,7 +358,8 @@ static int print_mesh_param_handler(struct nl_msg *msg, void *arg)
 static int get_interface_meshparam(struct nl80211_state *state,
                                   struct nl_cb *cb,
                                   struct nl_msg *msg,
-                                  int argc, char **argv)
+                                  int argc, char **argv,
+                                  enum id_input id)
 {
        const struct mesh_param_descr *mdescr = NULL;
 
@@ -380,7 +382,8 @@ COMMAND(get, mesh_param, "[<param>]",
        "Retrieve mesh parameter (run command without any to see available ones).");
 
 static int join_mesh(struct nl80211_state *state, struct nl_cb *cb,
-                    struct nl_msg *msg, int argc, char **argv)
+                    struct nl_msg *msg, int argc, char **argv,
+                    enum id_input id)
 {
        struct nlattr *container;
        float rate;
@@ -428,7 +431,7 @@ static int join_mesh(struct nl80211_state *state, struct nl_cb *cb,
 
        if (!argc)
                return 0;
-       return set_interface_meshparam(state, cb, msg, argc, argv);
+       return set_interface_meshparam(state, cb, msg, argc, argv, id);
  nla_put_failure:
        return -ENOBUFS;
 }
@@ -438,7 +441,8 @@ COMMAND(mesh, join, "<mesh ID> [mcast-rate <rate in Mbps>] [vendor_sync on|off]"
        "Join a mesh with the given mesh ID with mcast-rate and mesh parameters.");
 
 static int leave_mesh(struct nl80211_state *state, struct nl_cb *cb,
-                     struct nl_msg *msg, int argc, char **argv)
+                     struct nl_msg *msg, int argc, char **argv,
+                     enum id_input id)
 {
        if (argc)
                return 1;

diff --git a/mpath.c b/mpath.c
index 3afe7b763c0a6812a3c8cc8474504831d5600d86..8f0869840122426e3c04186959d3b3930117bd61 100644 (file)
--- a/mpath.c
+++ b/mpath.c
@@ -99,7 +99,8 @@ static int print_mpath_handler(struct nl_msg *msg, void *arg)
 static int handle_mpath_get(struct nl80211_state *state,
                            struct nl_cb *cb,
                            struct nl_msg *msg,
-                           int argc, char **argv)
+                           int argc, char **argv,
+                           enum id_input id)
 {
        unsigned char dst[ETH_ALEN];
 
@@ -134,7 +135,8 @@ COMMAND(mpath, del, "<MAC address>",
 static int handle_mpath_set(struct nl80211_state *state,
                            struct nl_cb *cb,
                            struct nl_msg *msg,
-                           int argc, char **argv)
+                           int argc, char **argv,
+                           enum id_input id)
 {
        unsigned char dst[ETH_ALEN];
        unsigned char next_hop[ETH_ALEN];
@@ -182,7 +184,8 @@ COMMAND(mpath, set, "<destination MAC address> next_hop <next hop MAC address>",
 static int handle_mpath_dump(struct nl80211_state *state,
                             struct nl_cb *cb,
                             struct nl_msg *msg,
-                            int argc, char **argv)
+                            int argc, char **argv,
+                            enum id_input id)
 {
        printf("DEST ADDR         NEXT HOP          IFACE\tSN\tMETRIC\tQLEN\t"
               "EXPTIME\t\tDTIM\tDRET\tFLAGS\n");

diff --git a/offch.c b/offch.c
index b40a52339deefe97b5ffd83356c2d43d12f2a198..d8c67c0328af638b8e6f82517234676690cc6fc2 100644 (file)
--- a/offch.c
+++ b/offch.c
@@ -10,7 +10,8 @@
 #include "iw.h"
 
 static int offchannel(struct nl80211_state *state, struct nl_cb *cb,
-                     struct nl_msg *msg, int argc, char **argv)
+                     struct nl_msg *msg, int argc, char **argv,
+                     enum id_input id)
 {
        char *end;
 

diff --git a/phy.c b/phy.c
index 839aead239eb3cb10069b1ebbaa9a184c4747075..860f29936392830b299694aa755e2d06335793f3 100644 (file)
--- a/phy.c
+++ b/phy.c
@@ -15,7 +15,8 @@
 static int handle_name(struct nl80211_state *state,
                       struct nl_cb *cb,
                       struct nl_msg *msg,
-                      int argc, char **argv)
+                      int argc, char **argv,
+                      enum id_input id)
 {
        if (argc != 1)
                return 1;
@@ -78,7 +79,8 @@ static int handle_freqchan(struct nl_msg *msg, bool chan,
 
 static int handle_freq(struct nl80211_state *state,
                       struct nl_cb *cb, struct nl_msg *msg,
-                      int argc, char **argv)
+                      int argc, char **argv,
+                      enum id_input id)
 {
        return handle_freqchan(msg, false, argc, argv);
 }
@@ -91,7 +93,8 @@ COMMAND(set, freq, "<freq> [HT20|HT40+|HT40-]",
 
 static int handle_chan(struct nl80211_state *state,
                       struct nl_cb *cb, struct nl_msg *msg,
-                      int argc, char **argv)
+                      int argc, char **argv,
+                      enum id_input id)
 {
        return handle_freqchan(msg, true, argc, argv);
 }
@@ -102,7 +105,8 @@ COMMAND(set, channel, "<channel> [HT20|HT40+|HT40-]",
 
 static int handle_fragmentation(struct nl80211_state *state,
                                struct nl_cb *cb, struct nl_msg *msg,
-                               int argc, char **argv)
+                               int argc, char **argv,
+                               enum id_input id)
 {
        unsigned int frag;
 
@@ -133,7 +137,8 @@ COMMAND(set, frag, "<fragmentation threshold|off>",
 
 static int handle_rts(struct nl80211_state *state,
                      struct nl_cb *cb, struct nl_msg *msg,
-                     int argc, char **argv)
+                     int argc, char **argv,
+                     enum id_input id)
 {
        unsigned int rts;
 
@@ -165,7 +170,8 @@ COMMAND(set, rts, "<rts threshold|off>",
 static int handle_netns(struct nl80211_state *state,
                        struct nl_cb *cb,
                        struct nl_msg *msg,
-                       int argc, char **argv)
+                       int argc, char **argv,
+                       enum id_input id)
 {
        char *end;
 
@@ -192,7 +198,8 @@ COMMAND(set, netns, "<pid>",
 static int handle_coverage(struct nl80211_state *state,
                        struct nl_cb *cb,
                        struct nl_msg *msg,
-                       int argc, char **argv)
+                       int argc, char **argv,
+                       enum id_input id)
 {
        char *end;
        unsigned int coverage;
@@ -223,7 +230,8 @@ COMMAND(set, coverage, "<coverage class>",
 static int handle_distance(struct nl80211_state *state,
                        struct nl_cb *cb,
                        struct nl_msg *msg,
-                       int argc, char **argv)
+                       int argc, char **argv,
+                       enum id_input id)
 {
        char *end;
        unsigned int distance, coverage;
@@ -263,7 +271,8 @@ COMMAND(set, distance, "<distance>",
 static int handle_txpower(struct nl80211_state *state,
                          struct nl_cb *cb,
                          struct nl_msg *msg,
-                         int argc, char **argv)
+                         int argc, char **argv,
+                         enum id_input id)
 {
        enum nl80211_tx_power_setting type;
        int mbm;
@@ -314,7 +323,8 @@ COMMAND(set, txpower, "<auto|fixed|limit> [<tx power in mBm>]",
 static int handle_antenna(struct nl80211_state *state,
                          struct nl_cb *cb,
                          struct nl_msg *msg,
-                         int argc, char **argv)
+                         int argc, char **argv,
+                         enum id_input id)
 {
        char *end;
        uint32_t tx_ant = 0, rx_ant = 0;

diff --git a/ps.c b/ps.c
index 6feeeb933107a6c0061586c220f405d67447ccb6..4c8e2d1904859384d2cf81998ee0888f63651129 100644 (file)
--- a/ps.c
+++ b/ps.c
@@ -11,7 +11,8 @@
 static int set_power_save(struct nl80211_state *state,
                          struct nl_cb *cb,
                          struct nl_msg *msg,
-                         int argc, char **argv)
+                         int argc, char **argv,
+                         enum id_input id)
 {
        enum nl80211_ps_state ps_state;
 
@@ -71,7 +72,8 @@ static int print_power_save_handler(struct nl_msg *msg, void *arg)
 static int get_power_save(struct nl80211_state *state,
                                   struct nl_cb *cb,
                                   struct nl_msg *msg,
-                                  int argc, char **argv)
+                                  int argc, char **argv,
+                                  enum id_input id)
 {
        nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM,
                  print_power_save_handler, NULL);

diff --git a/reg.c b/reg.c
index 06bbd4c4e80953251664cf4073de74f298106ef4..5afc92b142fd034ed2e4027b303dce1505e7feb8 100644 (file)
--- a/reg.c
+++ b/reg.c
@@ -62,7 +62,8 @@ char *reg_initiator_to_string(__u8 initiator)
 static int handle_reg_set(struct nl80211_state *state,
                          struct nl_cb *cb,
                          struct nl_msg *msg,
-                         int argc, char **argv)
+                         int argc, char **argv,
+                         enum id_input id)
 {
        char alpha2[3];
 
@@ -182,7 +183,8 @@ static int print_reg_handler(struct nl_msg *msg, void *arg)
 static int handle_reg_get(struct nl80211_state *state,
                          struct nl_cb *cb,
                          struct nl_msg *msg,
-                         int argc, char **argv)
+                         int argc, char **argv,
+                         enum id_input id)
 {
        nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_reg_handler, NULL);
        return 0;

diff --git a/roc.c b/roc.c
index 1b29e6ae31239e96f63cb20478db2d39d283faaa..c48fbd3db78a45a01b5e21a18bffff32f8037cb2 100644 (file)
--- a/roc.c
+++ b/roc.c
@@ -14,7 +14,8 @@
 SECTION(roc);
 
 static int handle_roc_start(struct nl80211_state *state, struct nl_cb *cb,
-                           struct nl_msg *msg, int argc, char **argv)
+                           struct nl_msg *msg, int argc, char **argv,
+                           enum id_input id)
 {
        char *end;
        int freq, time;

diff --git a/scan.c b/scan.c
index 7ae792965ce503eee1d5d947a2b675ac4bcb0d13..be9eaff482a5af9f018cb221e280759f790f13c8 100644 (file)
--- a/scan.c
+++ b/scan.c
@@ -55,7 +55,8 @@ union ieee80211_country_ie_triplet {
 static int handle_scan(struct nl80211_state *state,
                       struct nl_cb *cb,
                       struct nl_msg *msg,
-                      int argc, char **argv)
+                      int argc, char **argv,
+                      enum id_input id)
 {
        struct nl_msg *ssids = NULL, *freqs = NULL;
        char *eptr;
@@ -1247,7 +1248,8 @@ static struct scan_params scan_params;
 static int handle_scan_dump(struct nl80211_state *state,
                            struct nl_cb *cb,
                            struct nl_msg *msg,
-                           int argc, char **argv)
+                           int argc, char **argv,
+                           enum id_input id)
 {
        if (argc > 1)
                return 1;
@@ -1269,7 +1271,8 @@ static int handle_scan_dump(struct nl80211_state *state,
 static int handle_scan_combined(struct nl80211_state *state,
                                struct nl_cb *cb,
                                struct nl_msg *msg,
-                               int argc, char **argv)
+                               int argc, char **argv,
+                               enum id_input id)
 {
        char **trig_argv;
        static char *dump_argv[] = {

diff --git a/station.c b/station.c
index 45e84adca426fa7e2cc135a23734a9904df69b01..247f44588aeb0c9af5f00cc301c5f50ca6a7d6a6 100644 (file)
--- a/station.c
+++ b/station.c
@@ -238,7 +238,8 @@ static int print_sta_handler(struct nl_msg *msg, void *arg)
 static int handle_station_get(struct nl80211_state *state,
                              struct nl_cb *cb,
                              struct nl_msg *msg,
-                             int argc, char **argv)
+                             int argc, char **argv,
+                             enum id_input id)
 {
        unsigned char mac_addr[ETH_ALEN];
 
@@ -288,7 +289,8 @@ static const struct cmd *select_station_cmd(int argc, char **argv)
 static int handle_station_set_plink(struct nl80211_state *state,
                              struct nl_cb *cb,
                              struct nl_msg *msg,
-                             int argc, char **argv)
+                             int argc, char **argv,
+                             enum id_input id)
 {
        unsigned char plink_action;
        unsigned char mac_addr[ETH_ALEN];
@@ -335,9 +337,10 @@ COMMAND_ALIAS(station, set, "<MAC address> plink_action <open|block>",
        select_station_cmd, station_set_plink);
 
 static int handle_station_set_vlan(struct nl80211_state *state,
-                             struct nl_cb *cb,
-                             struct nl_msg *msg,
-                             int argc, char **argv)
+                                  struct nl_cb *cb,
+                                  struct nl_msg *msg,
+                                  int argc, char **argv,
+                                  enum id_input id)
 {
        unsigned char mac_addr[ETH_ALEN];
        unsigned long sta_vlan = 0;
@@ -385,7 +388,8 @@ COMMAND_ALIAS(station, set, "<MAC address> vlan <ifindex>",
 static int handle_station_dump(struct nl80211_state *state,
                               struct nl_cb *cb,
                               struct nl_msg *msg,
-                              int argc, char **argv)
+                              int argc, char **argv,
+                              enum id_input id)
 {
        nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_sta_handler, NULL);
        return 0;

diff --git a/survey.c b/survey.c
index 0810d0c2721ef3288504521e9a433ebd51b25881..39cd7b8cd1531dfa8b48318ac4dde1903f2a987d 100644 (file)
--- a/survey.c
+++ b/survey.c
@@ -69,9 +69,10 @@ static int print_survey_handler(struct nl_msg *msg, void *arg)
 }
 
 static int handle_survey_dump(struct nl80211_state *state,
-                              struct nl_cb *cb,
-                              struct nl_msg *msg,
-                              int argc, char **argv)
+                             struct nl_cb *cb,
+                             struct nl_msg *msg,
+                             int argc, char **argv,
+                             enum id_input id)
 {
        nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_survey_handler, NULL);
        return 0;

diff --git a/wowlan.c b/wowlan.c
index fa33c1f0b857b7f719a5e3ca4e9bcb895c53da35..6d324efc51d94e607be0b69c58683e6738b52b04 100644 (file)
--- a/wowlan.c
+++ b/wowlan.c
@@ -14,7 +14,8 @@
 SECTION(wowlan);
 
 static int handle_wowlan_enable(struct nl80211_state *state, struct nl_cb *cb,
-                               struct nl_msg *msg, int argc, char **argv)
+                               struct nl_msg *msg, int argc, char **argv,
+                               enum id_input id)
 {
        struct nlattr *wowlan, *pattern;
        struct nl_msg *patterns = NULL;
@@ -99,7 +100,8 @@ COMMAND(wowlan, enable, "[any] [disconnect] [magic-packet] [gtk-rekey-failure] [
 
 
 static int handle_wowlan_disable(struct nl80211_state *state, struct nl_cb *cb,
-                                struct nl_msg *msg, int argc, char **argv)
+                                struct nl_msg *msg, int argc, char **argv,
+                                enum id_input id)
 {
        /* just a set w/o wowlan attribute */
        return 0;
@@ -185,7 +187,8 @@ static int print_wowlan_handler(struct nl_msg *msg, void *arg)
 }
 
 static int handle_wowlan_show(struct nl80211_state *state, struct nl_cb *cb,
-                             struct nl_msg *msg, int argc, char **argv)
+                             struct nl_msg *msg, int argc, char **argv,
+                             enum id_input id)
 {
        nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM,
                  print_wowlan_handler, NULL);