treewide: fix replace nbd@openwrt.org with nbd@nbd.name
[openwrt.org/openwrt.git] / package / network / services / hostapd / patches / 600-ubus_support.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -155,6 +155,11 @@ OBJS += ../src/common/hw_features_common
 
 OBJS += ../src/eapol_auth/eapol_auth_sm.o
 
+ifdef CONFIG_UBUS
+CFLAGS += -DUBUS_SUPPORT
+OBJS += ../src/ap/ubus.o
+LIBS += -lubox -lubus
+endif
 
 ifdef CONFIG_CODE_COVERAGE
 CFLAGS += -O0 -fprofile-arcs -ftest-coverage
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
@@ -13,6 +13,7 @@
 #include "utils/list.h"
 #include "ap_config.h"
 #include "drivers/driver.h"
+#include "ubus.h"
 
 struct wpa_ctrl_dst;
 struct radius_server_data;
@@ -107,6 +108,7 @@ struct hostapd_data {
        struct hostapd_iface *iface;
        struct hostapd_config *iconf;
        struct hostapd_bss_config *conf;
+       struct hostapd_ubus_bss ubus;
        int interface_added; /* virtual interface added for this BSS */
        unsigned int started:1;
        unsigned int disabled:1;
@@ -299,6 +301,8 @@ struct hostapd_iface {
        struct hostapd_config *conf;
        char phy[16]; /* Name of the PHY (radio) */
 
+       struct hostapd_ubus_iface ubus;
+
        enum hostapd_iface_state {
                HAPD_IFACE_UNINITIALIZED,
                HAPD_IFACE_DISABLED,
--- /dev/null
+++ b/src/ap/ubus.c
@@ -0,0 +1,536 @@
+/*
+ * hostapd / ubus support
+ * Copyright (c) 2013, Felix Fietkau <nbd@nbd.name>
+ *
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
+ */
+
+#include "utils/includes.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
+#include "common/ieee802_11_defs.h"
+#include "hostapd.h"
+#include "wps_hostapd.h"
+#include "sta_info.h"
+#include "ubus.h"
+#include "ap_drv_ops.h"
+#include "beacon.h"
+
+static struct ubus_context *ctx;
+static struct blob_buf b;
+static int ctx_ref;
+
+static inline struct hostapd_data *get_hapd_from_object(struct ubus_object *obj)
+{
+       return container_of(obj, struct hostapd_data, ubus.obj);
+}
+
+
+struct ubus_banned_client {
+       struct avl_node avl;
+       u8 addr[ETH_ALEN];
+};
+
+static void ubus_receive(int sock, void *eloop_ctx, void *sock_ctx)
+{
+       struct ubus_context *ctx = eloop_ctx;
+       ubus_handle_event(ctx);
+}
+
+static void ubus_reconnect_timeout(void *eloop_data, void *user_ctx)
+{
+       if (ubus_reconnect(ctx, NULL)) {
+               eloop_register_timeout(1, 0, ubus_reconnect_timeout, ctx, NULL);
+               return;
+       }
+
+       eloop_register_read_sock(ctx->sock.fd, ubus_receive, ctx, NULL);
+}
+
+static void hostapd_ubus_connection_lost(struct ubus_context *ctx)
+{
+       eloop_unregister_read_sock(ctx->sock.fd);
+       eloop_register_timeout(1, 0, ubus_reconnect_timeout, ctx, NULL);
+}
+
+static bool hostapd_ubus_init(void)
+{
+       if (ctx)
+               return true;
+
+       ctx = ubus_connect(NULL);
+       if (!ctx)
+               return false;
+
+       ctx->connection_lost = hostapd_ubus_connection_lost;
+       eloop_register_read_sock(ctx->sock.fd, ubus_receive, ctx, NULL);
+       return true;
+}
+
+static void hostapd_ubus_ref_inc(void)
+{
+       ctx_ref++;
+}
+
+static void hostapd_ubus_ref_dec(void)
+{
+       ctx_ref--;
+       if (!ctx)
+               return;
+
+       if (ctx_ref)
+               return;
+
+       eloop_unregister_read_sock(ctx->sock.fd);
+       ubus_free(ctx);
+       ctx = NULL;
+}
+
+void hostapd_ubus_add_iface(struct hostapd_iface *iface)
+{
+       if (!hostapd_ubus_init())
+               return;
+}
+
+void hostapd_ubus_free_iface(struct hostapd_iface *iface)
+{
+       if (!ctx)
+               return;
+}
+
+static void
+hostapd_bss_del_ban(void *eloop_data, void *user_ctx)
+{
+       struct ubus_banned_client *ban = eloop_data;
+       struct hostapd_data *hapd = user_ctx;
+
+       avl_delete(&hapd->ubus.banned, &ban->avl);
+       free(ban);
+}
+
+static void
+hostapd_bss_ban_client(struct hostapd_data *hapd, u8 *addr, int time)
+{
+       struct ubus_banned_client *ban;
+
+       if (time < 0)
+               time = 0;
+
+       ban = avl_find_element(&hapd->ubus.banned, addr, ban, avl);
+       if (!ban) {
+               if (!time)
+                       return;
+
+               ban = os_zalloc(sizeof(*ban));
+               memcpy(ban->addr, addr, sizeof(ban->addr));
+               ban->avl.key = ban->addr;
+               avl_insert(&hapd->ubus.banned, &ban->avl);
+       } else {
+               eloop_cancel_timeout(hostapd_bss_del_ban, ban, hapd);
+               if (!time) {
+                       hostapd_bss_del_ban(ban, hapd);
+                       return;
+               }
+       }
+
+       eloop_register_timeout(0, time * 1000, hostapd_bss_del_ban, ban, hapd);
+}
+
+static int
+hostapd_bss_get_clients(struct ubus_context *ctx, struct ubus_object *obj,
+                       struct ubus_request_data *req, const char *method,
+                       struct blob_attr *msg)
+{
+       struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
+       struct sta_info *sta;
+       void *list, *c;
+       char mac_buf[20];
+       static const struct {
+               const char *name;
+               uint32_t flag;
+       } sta_flags[] = {
+               { "auth", WLAN_STA_AUTH },
+               { "assoc", WLAN_STA_ASSOC },
+               { "authorized", WLAN_STA_AUTHORIZED },
+               { "preauth", WLAN_STA_PREAUTH },
+               { "wds", WLAN_STA_WDS },
+               { "wmm", WLAN_STA_WMM },
+               { "ht", WLAN_STA_HT },
+               { "vht", WLAN_STA_VHT },
+               { "wps", WLAN_STA_WPS },
+               { "mfp", WLAN_STA_MFP },
+       };
+
+       blob_buf_init(&b, 0);
+       blobmsg_add_u32(&b, "freq", hapd->iface->freq);
+       list = blobmsg_open_table(&b, "clients");
+       for (sta = hapd->sta_list; sta; sta = sta->next) {
+               int i;
+
+               sprintf(mac_buf, MACSTR, MAC2STR(sta->addr));
+               c = blobmsg_open_table(&b, mac_buf);
+               for (i = 0; i < ARRAY_SIZE(sta_flags); i++)
+                       blobmsg_add_u8(&b, sta_flags[i].name,
+                                      !!(sta->flags & sta_flags[i].flag));
+               blobmsg_add_u32(&b, "aid", sta->aid);
+               blobmsg_close_table(&b, c);
+       }
+       blobmsg_close_array(&b, list);
+       ubus_send_reply(ctx, req, b.head);
+
+       return 0;
+}
+
+enum {
+       DEL_CLIENT_ADDR,
+       DEL_CLIENT_REASON,
+       DEL_CLIENT_DEAUTH,
+       DEL_CLIENT_BAN_TIME,
+       __DEL_CLIENT_MAX
+};
+
+static const struct blobmsg_policy del_policy[__DEL_CLIENT_MAX] = {
+       [DEL_CLIENT_ADDR] = { "addr", BLOBMSG_TYPE_STRING },
+       [DEL_CLIENT_REASON] = { "reason", BLOBMSG_TYPE_INT32 },
+       [DEL_CLIENT_DEAUTH] = { "deauth", BLOBMSG_TYPE_INT8 },
+       [DEL_CLIENT_BAN_TIME] = { "ban_time", BLOBMSG_TYPE_INT32 },
+};
+
+static int
+hostapd_bss_del_client(struct ubus_context *ctx, struct ubus_object *obj,
+                       struct ubus_request_data *req, const char *method,
+                       struct blob_attr *msg)
+{
+       struct blob_attr *tb[__DEL_CLIENT_MAX];
+       struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
+       struct sta_info *sta;
+       bool deauth = false;
+       int reason;
+       u8 addr[ETH_ALEN];
+
+       blobmsg_parse(del_policy, __DEL_CLIENT_MAX, tb, blob_data(msg), blob_len(msg));
+
+       if (!tb[DEL_CLIENT_ADDR])
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       if (hwaddr_aton(blobmsg_data(tb[DEL_CLIENT_ADDR]), addr))
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       if (tb[DEL_CLIENT_REASON])
+               reason = blobmsg_get_u32(tb[DEL_CLIENT_REASON]);
+
+       if (tb[DEL_CLIENT_DEAUTH])
+               deauth = blobmsg_get_bool(tb[DEL_CLIENT_DEAUTH]);
+
+       sta = ap_get_sta(hapd, addr);
+       if (sta) {
+               if (deauth) {
+                       hostapd_drv_sta_deauth(hapd, addr, reason);
+                       ap_sta_deauthenticate(hapd, sta, reason);
+               } else {
+                       hostapd_drv_sta_disassoc(hapd, addr, reason);
+                       ap_sta_disassociate(hapd, sta, reason);
+               }
+       }
+
+       if (tb[DEL_CLIENT_BAN_TIME])
+               hostapd_bss_ban_client(hapd, addr, blobmsg_get_u32(tb[DEL_CLIENT_BAN_TIME]));
+
+       return 0;
+}
+
+static void
+blobmsg_add_macaddr(struct blob_buf *buf, const char *name, const u8 *addr)
+{
+       char *s;
+
+       s = blobmsg_alloc_string_buffer(buf, name, 20);
+       sprintf(s, MACSTR, MAC2STR(addr));
+       blobmsg_add_string_buffer(buf);
+}
+
+static int
+hostapd_bss_list_bans(struct ubus_context *ctx, struct ubus_object *obj,
+                     struct ubus_request_data *req, const char *method,
+                     struct blob_attr *msg)
+{
+       struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
+       struct ubus_banned_client *ban;
+       void *c;
+
+       blob_buf_init(&b, 0);
+       c = blobmsg_open_array(&b, "clients");
+       avl_for_each_element(&hapd->ubus.banned, ban, avl)
+               blobmsg_add_macaddr(&b, NULL, ban->addr);
+       blobmsg_close_array(&b, c);
+       ubus_send_reply(ctx, req, b.head);
+
+       return 0;
+}
+
+static int
+hostapd_bss_wps_start(struct ubus_context *ctx, struct ubus_object *obj,
+                       struct ubus_request_data *req, const char *method,
+                       struct blob_attr *msg)
+{
+       int rc;
+       struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
+
+       rc = hostapd_wps_button_pushed(hapd, NULL);
+
+       if (rc != 0)
+               return UBUS_STATUS_NOT_SUPPORTED;
+
+       return 0;
+}
+
+static int
+hostapd_bss_wps_cancel(struct ubus_context *ctx, struct ubus_object *obj,
+                       struct ubus_request_data *req, const char *method,
+                       struct blob_attr *msg)
+{
+       int rc;
+       struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
+
+       rc = hostapd_wps_cancel(hapd);
+
+       if (rc != 0)
+               return UBUS_STATUS_NOT_SUPPORTED;
+
+       return 0;
+}
+
+static int
+hostapd_bss_update_beacon(struct ubus_context *ctx, struct ubus_object *obj,
+                       struct ubus_request_data *req, const char *method,
+                       struct blob_attr *msg)
+{
+       int rc;
+       struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
+
+       rc = ieee802_11_set_beacon(hapd);
+
+       if (rc != 0)
+               return UBUS_STATUS_NOT_SUPPORTED;
+
+       return 0;
+}
+
+enum {
+       CSA_FREQ,
+       CSA_BCN_COUNT,
+       __CSA_MAX
+};
+
+static const struct blobmsg_policy csa_policy[__CSA_MAX] = {
+       /*
+        * for now, frequency and beacon count are enough, add more
+        * parameters on demand
+        */
+       [CSA_FREQ] = { "freq", BLOBMSG_TYPE_INT32 },
+       [CSA_BCN_COUNT] = { "bcn_count", BLOBMSG_TYPE_INT32 },
+};
+
+#ifdef NEED_AP_MLME
+static int
+hostapd_switch_chan(struct ubus_context *ctx, struct ubus_object *obj,
+                   struct ubus_request_data *req, const char *method,
+                   struct blob_attr *msg)
+{
+       struct blob_attr *tb[__CSA_MAX];
+       struct hostapd_data *hapd = get_hapd_from_object(obj);
+       struct csa_settings css;
+
+       blobmsg_parse(csa_policy, __CSA_MAX, tb, blob_data(msg), blob_len(msg));
+
+       if (!tb[CSA_FREQ])
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       memset(&css, 0, sizeof(css));
+       css.freq_params.freq = blobmsg_get_u32(tb[CSA_FREQ]);
+       if (tb[CSA_BCN_COUNT])
+               css.cs_count = blobmsg_get_u32(tb[CSA_BCN_COUNT]);
+
+       if (hostapd_switch_channel(hapd, &css) != 0)
+               return UBUS_STATUS_NOT_SUPPORTED;
+       return UBUS_STATUS_OK;
+}
+#endif
+
+enum {
+       VENDOR_ELEMENTS,
+       __VENDOR_ELEMENTS_MAX
+};
+
+static const struct blobmsg_policy ve_policy[__VENDOR_ELEMENTS_MAX] = {
+       /* vendor elements are provided as hex-string */
+       [VENDOR_ELEMENTS] = { "vendor_elements", BLOBMSG_TYPE_STRING },
+};
+
+static int
+hostapd_vendor_elements(struct ubus_context *ctx, struct ubus_object *obj,
+                       struct ubus_request_data *req, const char *method,
+                       struct blob_attr *msg)
+{
+       struct blob_attr *tb[__VENDOR_ELEMENTS_MAX];
+       struct hostapd_data *hapd = get_hapd_from_object(obj);
+       struct hostapd_bss_config *bss = hapd->conf;
+       struct wpabuf *elems;
+       const char *pos;
+       size_t len;
+
+       blobmsg_parse(ve_policy, __VENDOR_ELEMENTS_MAX, tb,
+                     blob_data(msg), blob_len(msg));
+
+       if (!tb[VENDOR_ELEMENTS])
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       pos = blobmsg_data(tb[VENDOR_ELEMENTS]);
+       len = os_strlen(pos);
+       if (len & 0x01)
+                       return UBUS_STATUS_INVALID_ARGUMENT;
+
+       len /= 2;
+       if (len == 0) {
+               wpabuf_free(bss->vendor_elements);
+               bss->vendor_elements = NULL;
+               return 0;
+       }
+
+       elems = wpabuf_alloc(len);
+       if (elems == NULL)
+               return 1;
+
+       if (hexstr2bin(pos, wpabuf_put(elems, len), len)) {
+               wpabuf_free(elems);
+               return UBUS_STATUS_INVALID_ARGUMENT;
+       }
+
+       wpabuf_free(bss->vendor_elements);
+       bss->vendor_elements = elems;
+
+       /* update beacons if vendor elements were set successfully */
+       if (ieee802_11_update_beacons(hapd->iface) != 0)
+               return UBUS_STATUS_NOT_SUPPORTED;
+       return UBUS_STATUS_OK;
+}
+
+static const struct ubus_method bss_methods[] = {
+       UBUS_METHOD_NOARG("get_clients", hostapd_bss_get_clients),
+       UBUS_METHOD("del_client", hostapd_bss_del_client, del_policy),
+       UBUS_METHOD_NOARG("list_bans", hostapd_bss_list_bans),
+       UBUS_METHOD_NOARG("wps_start", hostapd_bss_wps_start),
+       UBUS_METHOD_NOARG("wps_cancel", hostapd_bss_wps_cancel),
+       UBUS_METHOD_NOARG("update_beacon", hostapd_bss_update_beacon),
+#ifdef NEED_AP_MLME
+       UBUS_METHOD("switch_chan", hostapd_switch_chan, csa_policy),
+#endif
+       UBUS_METHOD("set_vendor_elements", hostapd_vendor_elements, ve_policy),
+};
+
+static struct ubus_object_type bss_object_type =
+       UBUS_OBJECT_TYPE("hostapd_bss", bss_methods);
+
+static int avl_compare_macaddr(const void *k1, const void *k2, void *ptr)
+{
+       return memcmp(k1, k2, ETH_ALEN);
+}
+
+void hostapd_ubus_add_bss(struct hostapd_data *hapd)
+{
+       struct ubus_object *obj = &hapd->ubus.obj;
+       char *name;
+       int ret;
+
+       if (!hostapd_ubus_init())
+               return;
+
+       if (asprintf(&name, "hostapd.%s", hapd->conf->iface) < 0)
+               return;
+
+       avl_init(&hapd->ubus.banned, avl_compare_macaddr, false, NULL);
+       obj->name = name;
+       obj->type = &bss_object_type;
+       obj->methods = bss_object_type.methods;
+       obj->n_methods = bss_object_type.n_methods;
+       ret = ubus_add_object(ctx, obj);
+       hostapd_ubus_ref_inc();
+}
+
+void hostapd_ubus_free_bss(struct hostapd_data *hapd)
+{
+       struct ubus_object *obj = &hapd->ubus.obj;
+       char *name = (char *) obj->name;
+
+       if (!ctx)
+               return;
+
+       if (obj->id) {
+               ubus_remove_object(ctx, obj);
+               hostapd_ubus_ref_dec();
+       }
+
+       free(name);
+}
+
+struct ubus_event_req {
+       struct ubus_notify_request nreq;
+       bool deny;
+};
+
+static void
+ubus_event_cb(struct ubus_notify_request *req, int idx, int ret)
+{
+       struct ubus_event_req *ureq = container_of(req, struct ubus_event_req, nreq);
+
+       if (ret)
+               ureq->deny = true;
+}
+
+int hostapd_ubus_handle_event(struct hostapd_data *hapd, struct hostapd_ubus_request *req)
+{
+       struct ubus_banned_client *ban;
+       const char *types[HOSTAPD_UBUS_TYPE_MAX] = {
+               [HOSTAPD_UBUS_PROBE_REQ] = "probe",
+               [HOSTAPD_UBUS_AUTH_REQ] = "auth",
+               [HOSTAPD_UBUS_ASSOC_REQ] = "assoc",
+       };
+       const char *type = "mgmt";
+       struct ubus_event_req ureq = {};
+       const u8 *addr;
+
+       if (req->mgmt_frame)
+               addr = req->mgmt_frame->sa;
+       else
+               addr = req->addr;
+
+       ban = avl_find_element(&hapd->ubus.banned, addr, ban, avl);
+       if (ban)
+               return -2;
+
+       if (!hapd->ubus.obj.has_subscribers)
+               return 0;
+
+       if (req->type < ARRAY_SIZE(types))
+               type = types[req->type];
+
+       blob_buf_init(&b, 0);
+       blobmsg_add_macaddr(&b, "address", addr);
+       if (req->mgmt_frame)
+               blobmsg_add_macaddr(&b, "target", req->mgmt_frame->da);
+       if (req->frame_info)
+               blobmsg_add_u32(&b, "signal", req->frame_info->ssi_signal);
+       blobmsg_add_u32(&b, "freq", hapd->iface->freq);
+
+       if (ubus_notify_async(ctx, &hapd->ubus.obj, type, b.head, &ureq.nreq))
+               return 0;
+
+       ureq.nreq.status_cb = ubus_event_cb;
+       ubus_complete_request(ctx, &ureq.nreq.req, 100);
+
+       if (ureq.deny)
+               return -1;
+
+       return 0;
+}
--- /dev/null
+++ b/src/ap/ubus.h
@@ -0,0 +1,78 @@
+/*
+ * hostapd / ubus support
+ * Copyright (c) 2013, Felix Fietkau <nbd@nbd.name>
+ *
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
+ */
+#ifndef __HOSTAPD_UBUS_H
+#define __HOSTAPD_UBUS_H
+
+enum hostapd_ubus_event_type {
+       HOSTAPD_UBUS_PROBE_REQ,
+       HOSTAPD_UBUS_AUTH_REQ,
+       HOSTAPD_UBUS_ASSOC_REQ,
+       HOSTAPD_UBUS_TYPE_MAX
+};
+
+struct hostapd_ubus_request {
+       enum hostapd_ubus_event_type type;
+       const struct ieee80211_mgmt *mgmt_frame;
+       const struct hostapd_frame_info *frame_info;
+       const u8 *addr;
+};
+
+struct hostapd_iface;
+struct hostapd_data;
+
+#ifdef UBUS_SUPPORT
+
+#include <libubox/avl.h>
+#include <libubus.h>
+
+struct hostapd_ubus_iface {
+       struct ubus_object obj;
+};
+
+struct hostapd_ubus_bss {
+       struct ubus_object obj;
+       struct avl_tree banned;
+};
+
+void hostapd_ubus_add_iface(struct hostapd_iface *iface);
+void hostapd_ubus_free_iface(struct hostapd_iface *iface);
+void hostapd_ubus_add_bss(struct hostapd_data *hapd);
+void hostapd_ubus_free_bss(struct hostapd_data *hapd);
+
+int hostapd_ubus_handle_event(struct hostapd_data *hapd, struct hostapd_ubus_request *req);
+
+#else
+
+struct hostapd_ubus_iface {};
+
+struct hostapd_ubus_bss {};
+
+static inline void hostapd_ubus_add_iface(struct hostapd_iface *iface)
+{
+}
+
+static inline void hostapd_ubus_free_iface(struct hostapd_iface *iface)
+{
+}
+
+static inline void hostapd_ubus_add_bss(struct hostapd_data *hapd)
+{
+}
+
+static inline void hostapd_ubus_free_bss(struct hostapd_data *hapd)
+{
+}
+
+static inline int hostapd_ubus_handle_event(struct hostapd_data *hapd, struct hostapd_ubus_request *req)
+{
+       return 0;
+}
+
+#endif
+
+#endif
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -280,6 +280,7 @@ static void hostapd_free_hapd_data(struc
        hapd->started = 0;
 
        wpa_printf(MSG_DEBUG, "%s(%s)", __func__, hapd->conf->iface);
+       hostapd_ubus_free_bss(hapd);
        iapp_deinit(hapd->iapp);
        hapd->iapp = NULL;
        accounting_deinit(hapd);
@@ -1118,6 +1119,8 @@ static int hostapd_setup_bss(struct host
        if (hapd->driver && hapd->driver->set_operstate)
                hapd->driver->set_operstate(hapd->drv_priv, 1);
 
+       hostapd_ubus_add_bss(hapd);
+
        return 0;
 }
 
@@ -1523,6 +1526,7 @@ static int hostapd_setup_interface_compl
        if (err)
                goto fail;
 
+       hostapd_ubus_add_iface(iface);
        wpa_printf(MSG_DEBUG, "Completing interface initialization");
        if (iface->conf->channel) {
 #ifdef NEED_AP_MLME
@@ -1700,6 +1704,7 @@ dfs_offload:
 
 fail:
        wpa_printf(MSG_ERROR, "Interface initialization failed");
+       hostapd_ubus_free_iface(iface);
        hostapd_set_state(iface, HAPD_IFACE_DISABLED);
        wpa_msg(hapd->msg_ctx, MSG_INFO, AP_EVENT_DISABLED);
 #ifdef CONFIG_FST
@@ -2125,6 +2130,7 @@ void hostapd_interface_deinit_free(struc
                   (unsigned int) iface->conf->num_bss);
        driver = iface->bss[0]->driver;
        drv_priv = iface->bss[0]->drv_priv;
+       hostapd_ubus_free_iface(iface);
        hostapd_interface_deinit(iface);
        wpa_printf(MSG_DEBUG, "%s: driver=%p drv_priv=%p -> hapd_deinit",
                   __func__, driver, drv_priv);
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -877,7 +877,8 @@ int auth_sae_init_committed(struct hosta
 
 
 static void handle_auth(struct hostapd_data *hapd,
-                       const struct ieee80211_mgmt *mgmt, size_t len)
+                       const struct ieee80211_mgmt *mgmt, size_t len,
+                       struct hostapd_frame_info *fi)
 {
        u16 auth_alg, auth_transaction, status_code;
        u16 resp = WLAN_STATUS_SUCCESS;
@@ -893,6 +894,11 @@ static void handle_auth(struct hostapd_d
        char *identity = NULL;
        char *radius_cui = NULL;
        u16 seq_ctrl;
+       struct hostapd_ubus_request req = {
+               .type = HOSTAPD_UBUS_AUTH_REQ,
+               .mgmt_frame = mgmt,
+               .frame_info = fi,
+       };
 
        if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.auth)) {
                wpa_printf(MSG_INFO, "handle_auth - too short payload (len=%lu)",
@@ -1044,6 +1050,14 @@ static void handle_auth(struct hostapd_d
                resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
                goto fail;
        }
+
+       if (hostapd_ubus_handle_event(hapd, &req)) {
+               wpa_printf(MSG_DEBUG, "Station " MACSTR " rejected by ubus handler.\n",
+                      MAC2STR(mgmt->sa));
+               resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
+               goto fail;
+       }
+
        if (res == HOSTAPD_ACL_PENDING) {
                wpa_printf(MSG_DEBUG, "Authentication frame from " MACSTR
                           " waiting for an external authentication",
@@ -1776,13 +1790,18 @@ static void send_assoc_resp(struct hosta
 
 static void handle_assoc(struct hostapd_data *hapd,
                         const struct ieee80211_mgmt *mgmt, size_t len,
-                        int reassoc)
+                        int reassoc, struct hostapd_frame_info *fi)
 {
        u16 capab_info, listen_interval, seq_ctrl, fc;
        u16 resp = WLAN_STATUS_SUCCESS;
        const u8 *pos;
        int left, i;
        struct sta_info *sta;
+       struct hostapd_ubus_request req = {
+               .type = HOSTAPD_UBUS_ASSOC_REQ,
+               .mgmt_frame = mgmt,
+               .frame_info = fi,
+       };
 
        if (len < IEEE80211_HDRLEN + (reassoc ? sizeof(mgmt->u.reassoc_req) :
                                      sizeof(mgmt->u.assoc_req))) {
@@ -1902,6 +1921,13 @@ static void handle_assoc(struct hostapd_
                goto fail;
        }
 
+       if (hostapd_ubus_handle_event(hapd, &req)) {
+               wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
+                      MAC2STR(mgmt->sa));
+               resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
+               goto fail;
+       }
+
        sta->capability = capab_info;
        sta->listen_interval = listen_interval;
 
@@ -2328,7 +2354,7 @@ int ieee802_11_mgmt(struct hostapd_data
 
 
        if (stype == WLAN_FC_STYPE_PROBE_REQ) {
-               handle_probe_req(hapd, mgmt, len, fi->ssi_signal);
+               handle_probe_req(hapd, mgmt, len, fi);
                return 1;
        }
 
@@ -2346,17 +2372,17 @@ int ieee802_11_mgmt(struct hostapd_data
        switch (stype) {
        case WLAN_FC_STYPE_AUTH:
                wpa_printf(MSG_DEBUG, "mgmt::auth");
-               handle_auth(hapd, mgmt, len);
+               handle_auth(hapd, mgmt, len, fi);
                ret = 1;
                break;
        case WLAN_FC_STYPE_ASSOC_REQ:
                wpa_printf(MSG_DEBUG, "mgmt::assoc_req");
-               handle_assoc(hapd, mgmt, len, 0);
+               handle_assoc(hapd, mgmt, len, 0, fi);
                ret = 1;
                break;
        case WLAN_FC_STYPE_REASSOC_REQ:
                wpa_printf(MSG_DEBUG, "mgmt::reassoc_req");
-               handle_assoc(hapd, mgmt, len, 1);
+               handle_assoc(hapd, mgmt, len, 1, fi);
                ret = 1;
                break;
        case WLAN_FC_STYPE_DISASSOC:
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -667,7 +667,7 @@ sta_track_seen_on(struct hostapd_iface *
 
 void handle_probe_req(struct hostapd_data *hapd,
                      const struct ieee80211_mgmt *mgmt, size_t len,
-                     int ssi_signal)
+                     struct hostapd_frame_info *fi)
 {
        u8 *resp;
        struct ieee802_11_elems elems;
@@ -676,9 +676,15 @@ void handle_probe_req(struct hostapd_dat
        size_t i, resp_len;
        int noack;
        enum ssid_match_result res;
+       int ssi_signal = fi->ssi_signal;
        int ret;
        u16 csa_offs[2];
        size_t csa_offs_len;
+       struct hostapd_ubus_request req = {
+               .type = HOSTAPD_UBUS_PROBE_REQ,
+               .mgmt_frame = mgmt,
+               .frame_info = fi,
+       };
 
        ie = mgmt->u.probe_req.variable;
        if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.probe_req))
@@ -830,6 +836,12 @@ void handle_probe_req(struct hostapd_dat
        }
 #endif /* CONFIG_P2P */
 
+       if (hostapd_ubus_handle_event(hapd, &req)) {
+               wpa_printf(MSG_DEBUG, "Probe request for " MACSTR " rejected by ubus handler.\n",
+                      MAC2STR(mgmt->sa));
+               return;
+       }
+
        /* TODO: verify that supp_rates contains at least one matching rate
         * with AP configuration */
 
--- a/src/ap/beacon.h
+++ b/src/ap/beacon.h
@@ -14,7 +14,7 @@ struct ieee80211_mgmt;
 
 void handle_probe_req(struct hostapd_data *hapd,
                      const struct ieee80211_mgmt *mgmt, size_t len,
-                     int ssi_signal);
+                     struct hostapd_frame_info *fi);
 int ieee802_11_set_beacon(struct hostapd_data *hapd);
 int ieee802_11_set_beacons(struct hostapd_iface *iface);
 int ieee802_11_update_beacons(struct hostapd_iface *iface);
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -51,6 +51,10 @@ int hostapd_notif_assoc(struct hostapd_d
        u16 reason = WLAN_REASON_UNSPECIFIED;
        u16 status = WLAN_STATUS_SUCCESS;
        const u8 *p2p_dev_addr = NULL;
+       struct hostapd_ubus_request req = {
+               .type = HOSTAPD_UBUS_ASSOC_REQ,
+               .addr = addr,
+       };
 
        if (addr == NULL) {
                /*
@@ -123,6 +127,12 @@ int hostapd_notif_assoc(struct hostapd_d
                goto fail;
        }
 
+       if (hostapd_ubus_handle_event(hapd, &req)) {
+               wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
+                          MAC2STR(req.addr));
+               goto fail;
+       }
+
 #ifdef CONFIG_P2P
        if (elems.p2p) {
                wpabuf_free(sta->p2p_ie);
 
comments