380-disable_ctrl_iface_mib.patch 5.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178
  1. --- a/hostapd/Makefile
  2. +++ b/hostapd/Makefile
  3. @@ -220,6 +220,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. ifeq ($(CONFIG_CTRL_IFACE), udp)
  11. CFLAGS += -DCONFIG_CTRL_IFACE_UDP
  12. else
  13. --- a/hostapd/ctrl_iface.c
  14. +++ b/hostapd/ctrl_iface.c
  15. @@ -2471,6 +2471,7 @@ static int hostapd_ctrl_iface_receive_pr
  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. @@ -2512,6 +2513,7 @@ static int hostapd_ctrl_iface_receive_pr
  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. @@ -891,6 +891,9 @@ ifdef CONFIG_MBO
  34. OBJS += ../src/ap/mbo_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. --- a/wpa_supplicant/ctrl_iface.c
  43. +++ b/wpa_supplicant/ctrl_iface.c
  44. @@ -1907,7 +1907,7 @@ static int wpa_supplicant_ctrl_iface_sta
  45. pos += ret;
  46. }
  47. -#ifdef CONFIG_AP
  48. +#if defined(CONFIG_AP) && defined(CONFIG_CTRL_IFACE_MIB)
  49. if (wpa_s->ap_iface) {
  50. pos += ap_ctrl_iface_wpa_get_status(wpa_s, pos,
  51. end - pos,
  52. @@ -9032,6 +9032,7 @@ char * wpa_supplicant_ctrl_iface_process
  53. reply_len = -1;
  54. } else if (os_strncmp(buf, "NOTE ", 5) == 0) {
  55. wpa_printf(MSG_INFO, "NOTE: %s", buf + 5);
  56. +#ifdef CONFIG_CTRL_IFACE_MIB
  57. } else if (os_strcmp(buf, "MIB") == 0) {
  58. reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size);
  59. if (reply_len >= 0) {
  60. @@ -9039,6 +9040,7 @@ char * wpa_supplicant_ctrl_iface_process
  61. reply + reply_len,
  62. reply_size - reply_len);
  63. }
  64. +#endif
  65. } else if (os_strncmp(buf, "STATUS", 6) == 0) {
  66. reply_len = wpa_supplicant_ctrl_iface_status(
  67. wpa_s, buf + 6, reply, reply_size);
  68. @@ -9517,6 +9519,7 @@ char * wpa_supplicant_ctrl_iface_process
  69. reply_len = wpa_supplicant_ctrl_iface_bss(
  70. wpa_s, buf + 4, reply, reply_size);
  71. #ifdef CONFIG_AP
  72. +#ifdef CONFIG_CTRL_IFACE_MIB
  73. } else if (os_strcmp(buf, "STA-FIRST") == 0) {
  74. reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size);
  75. } else if (os_strncmp(buf, "STA ", 4) == 0) {
  76. @@ -9525,12 +9528,15 @@ char * wpa_supplicant_ctrl_iface_process
  77. } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
  78. reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply,
  79. reply_size);
  80. +#endif
  81. +#ifdef CONFIG_CTRL_IFACE_MIB
  82. } else if (os_strncmp(buf, "DEAUTHENTICATE ", 15) == 0) {
  83. if (ap_ctrl_iface_sta_deauthenticate(wpa_s, buf + 15))
  84. reply_len = -1;
  85. } else if (os_strncmp(buf, "DISASSOCIATE ", 13) == 0) {
  86. if (ap_ctrl_iface_sta_disassociate(wpa_s, buf + 13))
  87. reply_len = -1;
  88. +#endif
  89. } else if (os_strncmp(buf, "CHAN_SWITCH ", 12) == 0) {
  90. if (ap_ctrl_iface_chanswitch(wpa_s, buf + 12))
  91. reply_len = -1;
  92. --- a/src/ap/ctrl_iface_ap.c
  93. +++ b/src/ap/ctrl_iface_ap.c
  94. @@ -25,6 +25,7 @@
  95. #include "mbo_ap.h"
  96. #include "taxonomy.h"
  97. +#ifdef CONFIG_CTRL_IFACE_MIB
  98. static int hostapd_get_sta_tx_rx(struct hostapd_data *hapd,
  99. struct sta_info *sta,
  100. @@ -250,6 +251,7 @@ int hostapd_ctrl_iface_sta_next(struct h
  101. return hostapd_ctrl_iface_sta_mib(hapd, sta->next, buf, buflen);
  102. }
  103. +#endif
  104. #ifdef CONFIG_P2P_MANAGER
  105. static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype,
  106. --- a/src/ap/ieee802_1x.c
  107. +++ b/src/ap/ieee802_1x.c
  108. @@ -2490,6 +2490,7 @@ static const char * bool_txt(Boolean val
  109. return val ? "TRUE" : "FALSE";
  110. }
  111. +#ifdef CONFIG_CTRL_IFACE_MIB
  112. int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen)
  113. {
  114. @@ -2665,6 +2666,7 @@ int ieee802_1x_get_mib_sta(struct hostap
  115. return len;
  116. }
  117. +#endif
  118. #ifdef CONFIG_HS20
  119. static void ieee802_1x_wnm_notif_send(void *eloop_ctx, void *timeout_ctx)
  120. --- a/src/ap/wpa_auth.c
  121. +++ b/src/ap/wpa_auth.c
  122. @@ -3565,6 +3565,7 @@ static const char * wpa_bool_txt(int val
  123. return val ? "TRUE" : "FALSE";
  124. }
  125. +#ifdef CONFIG_CTRL_IFACE_MIB
  126. #define RSN_SUITE "%02x-%02x-%02x-%d"
  127. #define RSN_SUITE_ARG(s) \
  128. @@ -3709,7 +3710,7 @@ int wpa_get_mib_sta(struct wpa_state_mac
  129. return len;
  130. }
  131. -
  132. +#endif
  133. void wpa_auth_countermeasures_start(struct wpa_authenticator *wpa_auth)
  134. {
  135. --- a/src/rsn_supp/wpa.c
  136. +++ b/src/rsn_supp/wpa.c
  137. @@ -2308,6 +2308,8 @@ static u32 wpa_key_mgmt_suite(struct wpa
  138. }
  139. +#ifdef CONFIG_CTRL_IFACE_MIB
  140. +
  141. #define RSN_SUITE "%02x-%02x-%02x-%d"
  142. #define RSN_SUITE_ARG(s) \
  143. ((s) >> 24) & 0xff, ((s) >> 16) & 0xff, ((s) >> 8) & 0xff, (s) & 0xff
  144. @@ -2391,6 +2393,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch
  145. return (int) len;
  146. }
  147. +#endif
  148. #endif /* CONFIG_CTRL_IFACE */
  149. --- a/wpa_supplicant/ap.c
  150. +++ b/wpa_supplicant/ap.c
  151. @@ -1119,7 +1119,7 @@ int wpas_ap_wps_nfc_report_handover(stru
  152. #endif /* CONFIG_WPS */
  153. -#ifdef CONFIG_CTRL_IFACE
  154. +#if defined(CONFIG_CTRL_IFACE) && defined(CONFIG_CTRL_IFACE_MIB)
  155. int ap_ctrl_iface_sta_first(struct wpa_supplicant *wpa_s,
  156. char *buf, size_t buflen)