package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch

   1 --- a/hostapd/Makefile
   2 +++ b/hostapd/Makefile
   3 @@ -164,6 +164,9 @@ endif
   4  ifdef CONFIG_NO_CTRL_IFACE
   5  CFLAGS += -DCONFIG_NO_CTRL_IFACE
   6  else
   7 +ifdef CONFIG_CTRL_IFACE_MIB
   8 +CFLAGS += -DCONFIG_CTRL_IFACE_MIB
   9 +endif
  10  OBJS += ctrl_iface.o
  11  OBJS += ../src/ap/ctrl_iface_ap.o
  12  endif
  13 --- a/hostapd/ctrl_iface.c
  14 +++ b/hostapd/ctrl_iface.c
  15 @@ -1653,6 +1653,7 @@ static void hostapd_ctrl_iface_receive(i
  16                                                       reply_size);
  17         } else if (os_strcmp(buf, "STATUS-DRIVER") == 0) {
  18                 reply_len = hostapd_drv_status(hapd, reply, reply_size);
  19 +#ifdef CONFIG_CTRL_IFACE_MIB
  20         } else if (os_strcmp(buf, "MIB") == 0) {
  21                 reply_len = ieee802_11_get_mib(hapd, reply, reply_size);
  22                 if (reply_len >= 0) {
  23 @@ -1694,6 +1695,7 @@ static void hostapd_ctrl_iface_receive(i
  24         } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
  25                 reply_len = hostapd_ctrl_iface_sta_next(hapd, buf + 9, reply,
  26                                                         reply_size);
  27 +#endif
  28         } else if (os_strcmp(buf, "ATTACH") == 0) {
  29                 if (hostapd_ctrl_iface_attach(hapd, &from, fromlen))
  30                         reply_len = -1;
  31 --- a/wpa_supplicant/Makefile
  32 +++ b/wpa_supplicant/Makefile
  33 @@ -809,6 +809,9 @@ ifdef CONFIG_WNM
  34  OBJS += ../src/ap/wnm_ap.o
  35  endif
  36  ifdef CONFIG_CTRL_IFACE
  37 +ifdef CONFIG_CTRL_IFACE_MIB
  38 +CFLAGS += -DCONFIG_CTRL_IFACE_MIB
  39 +endif
  40  OBJS += ../src/ap/ctrl_iface_ap.o
  41  endif
  42
  43 --- a/wpa_supplicant/ctrl_iface.c
  44 +++ b/wpa_supplicant/ctrl_iface.c
  45 @@ -1628,7 +1628,7 @@ static int wpa_supplicant_ctrl_iface_sta
  46                         pos += ret;
  47                 }
  48
  49 -#ifdef CONFIG_AP
  50 +#if defined(CONFIG_AP) && defined(CONFIG_CTRL_IFACE_MIB)
  51                 if (wpa_s->ap_iface) {
  52                         pos += ap_ctrl_iface_wpa_get_status(wpa_s, pos,
  53                                                             end - pos,
  54 @@ -6720,6 +6720,7 @@ char * wpa_supplicant_ctrl_iface_process
  55                         reply_len = -1;
  56         } else if (os_strncmp(buf, "NOTE ", 5) == 0) {
  57                 wpa_printf(MSG_INFO, "NOTE: %s", buf + 5);
  58 +#ifdef CONFIG_CTRL_IFACE_MIB
  59         } else if (os_strcmp(buf, "MIB") == 0) {
  60                 reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size);
  61                 if (reply_len >= 0) {
  62 @@ -6731,6 +6732,7 @@ char * wpa_supplicant_ctrl_iface_process
  63                         else
  64                                 reply_len += res;
  65                 }
  66 +#endif
  67         } else if (os_strncmp(buf, "STATUS", 6) == 0) {
  68                 reply_len = wpa_supplicant_ctrl_iface_status(
  69                         wpa_s, buf + 6, reply, reply_size);
  70 @@ -7140,6 +7142,7 @@ char * wpa_supplicant_ctrl_iface_process
  71                 reply_len = wpa_supplicant_ctrl_iface_bss(
  72                         wpa_s, buf + 4, reply, reply_size);
  73  #ifdef CONFIG_AP
  74 +#ifdef CONFIG_CTRL_IFACE_MIB
  75         } else if (os_strcmp(buf, "STA-FIRST") == 0) {
  76                 reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size);
  77         } else if (os_strncmp(buf, "STA ", 4) == 0) {
  78 @@ -7148,12 +7151,15 @@ char * wpa_supplicant_ctrl_iface_process
  79         } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
  80                 reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply,
  81                                                    reply_size);
  82 +#endif
  83 +#ifdef CONFIG_CTRL_IFACE_MIB
  84         } else if (os_strncmp(buf, "DEAUTHENTICATE ", 15) == 0) {
  85                 if (ap_ctrl_iface_sta_deauthenticate(wpa_s, buf + 15))
  86                         reply_len = -1;
  87         } else if (os_strncmp(buf, "DISASSOCIATE ", 13) == 0) {
  88                 if (ap_ctrl_iface_sta_disassociate(wpa_s, buf + 13))
  89                         reply_len = -1;
  90 +#endif
  91         } else if (os_strncmp(buf, "CHAN_SWITCH ", 12) == 0) {
  92                 if (ap_ctrl_iface_chanswitch(wpa_s, buf + 12))
  93                         reply_len = -1;
  94 --- a/src/ap/ctrl_iface_ap.c
  95 +++ b/src/ap/ctrl_iface_ap.c
  96 @@ -21,6 +21,7 @@
  97  #include "ctrl_iface_ap.h"
  98  #include "ap_drv_ops.h"
  99
 100 +#ifdef CONFIG_CTRL_IFACE_MIB
 101
 102  static int hostapd_get_sta_tx_rx(struct hostapd_data *hapd,
 103                                  struct sta_info *sta,
 104 @@ -214,6 +215,7 @@ int hostapd_ctrl_iface_sta_next(struct h
 105         return hostapd_ctrl_iface_sta_mib(hapd, sta->next, buf, buflen);
 106  }
 107
 108 +#endif
 109
 110  #ifdef CONFIG_P2P_MANAGER
 111  static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype,
 112 @@ -527,3 +529,4 @@ int hostapd_parse_csa_settings(const cha
 113
 114         return 0;
 115  }
 116 +
 117 --- a/src/ap/ieee802_1x.c
 118 +++ b/src/ap/ieee802_1x.c
 119 @@ -2237,6 +2237,7 @@ static const char * bool_txt(Boolean boo
 120         return bool_val ? "TRUE" : "FALSE";
 121  }
 122
 123 +#ifdef CONFIG_CTRL_IFACE_MIB
 124
 125  int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen)
 126  {
 127 @@ -2404,6 +2405,7 @@ int ieee802_1x_get_mib_sta(struct hostap
 128         return len;
 129  }
 130
 131 +#endif
 132
 133  static void ieee802_1x_finished(struct hostapd_data *hapd,
 134                                 struct sta_info *sta, int success,
 135 --- a/src/ap/wpa_auth.c
 136 +++ b/src/ap/wpa_auth.c
 137 @@ -2835,6 +2835,7 @@ static const char * wpa_bool_txt(int boo
 138         return bool ? "TRUE" : "FALSE";
 139  }
 140
 141 +#ifdef CONFIG_CTRL_IFACE_MIB
 142
 143  #define RSN_SUITE "%02x-%02x-%02x-%d"
 144  #define RSN_SUITE_ARG(s) \
 145 @@ -2979,7 +2980,7 @@ int wpa_get_mib_sta(struct wpa_state_mac
 146
 147         return len;
 148  }
 149 -
 150 +#endif
 151
 152  void wpa_auth_countermeasures_start(struct wpa_authenticator *wpa_auth)
 153  {
 154 --- a/src/rsn_supp/wpa.c
 155 +++ b/src/rsn_supp/wpa.c
 156 @@ -1928,6 +1928,8 @@ static u32 wpa_key_mgmt_suite(struct wpa
 157  }
 158
 159
 160 +#ifdef CONFIG_CTRL_IFACE_MIB
 161 +
 162  #define RSN_SUITE "%02x-%02x-%02x-%d"
 163  #define RSN_SUITE_ARG(s) \
 164  ((s) >> 24) & 0xff, ((s) >> 16) & 0xff, ((s) >> 8) & 0xff, (s) & 0xff
 165 @@ -2011,6 +2013,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch
 166
 167         return (int) len;
 168  }
 169 +#endif
 170  #endif /* CONFIG_CTRL_IFACE */
 171
 172
 173 --- a/wpa_supplicant/ap.c
 174 +++ b/wpa_supplicant/ap.c
 175 @@ -975,7 +975,7 @@ int wpas_ap_wps_nfc_report_handover(stru
 176  #endif /* CONFIG_WPS */
 177
 178
 179 -#ifdef CONFIG_CTRL_IFACE
 180 +#if defined(CONFIG_CTRL_IFACE) && defined(CONFIG_CTRL_IFACE_MIB)
 181
 182  int ap_ctrl_iface_sta_first(struct wpa_supplicant *wpa_s,
 183                             char *buf, size_t buflen)