add bssid

src/include/LICENSE

@@ -0,0 +1,340 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {description}
+    Copyright (C) {year}  {fullname}
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  {signature of Ty Coon}, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
+

src/include/dawn_iwinfo.h

@@ -55,4 +55,6 @@ int compare_essid_iwinfo(__uint8_t *bssid_addr, __uint8_t *bssid_addr_to_compare
  */
 int get_expected_throughput(const char *ifname, uint8_t *client_addr);
 
+int get_bssid(const char *ifname, uint8_t *bssid_addr);
+
 #endif //DAWN_RSSI_H

src/include/script.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+for i in *.h # or whatever other pattern...
+do
+  if ! grep -q Copyright $i
+  then
+    cat LICENSE $i >$i.new && mv $i.new $i
+  fi
+done

src/utils/dawn_iwinfo.c

@@ -234,4 +234,14 @@ int get_expected_throughput(const char *ifname, uint8_t *client_addr) {
     }
 
     return INT_MIN;
+}
+
+int get_bssid(const char *ifname, uint8_t *bssid_addr) {
+    const struct iwinfo_ops *iw;
+
+    iw = iwinfo_backend(ifname);
+
+    // bssid
+    memcpy(bssid_addr, iw->bssid, ETH_ALEN * sizeof(uint8_t));
+    return 0;
 }

src/utils/ubus.c

@@ -21,7 +21,7 @@
 #include "datastorage.h"
 #include "tcpsocket.h"
 
-static struct ubus_context *ctx = NULL;
+//static struct ubus_context *ctx = NULL;
 static struct ubus_context *ctx_clients; /* own ubus conext otherwise strange behavior... */
 
 static struct ubus_subscriber hostapd_event;
@@ -31,6 +31,7 @@ static struct blob_buf network_buf;
 static struct blob_buf data_buf;
 static struct blob_buf b_probe;
 static struct blob_buf b_domain;
+static struct blob_buf b_notify;
 
 void update_clients(struct uloop_timeout *t);
 
@@ -47,7 +48,15 @@ struct uloop_timeout umdns_timer = {
 };
 
 #define MAX_HOSTAPD_SOCKETS 10
-uint32_t hostapd_sock_arr[MAX_HOSTAPD_SOCKETS];
+#define MAX_INTERFACE_NAME 64
+
+struct hostapd_sock_entry{
+    uint32_t id;
+    char iface_name[MAX_INTERFACE_NAME];
+    uint8_t bssid_addr[ETH_ALEN];
+};
+
+struct hostapd_sock_entry hostapd_sock_arr[MAX_HOSTAPD_SOCKETS];
 int hostapd_sock_last = -1;
 
 enum {
@@ -223,7 +232,9 @@ static int parse_add_mac_to_file(struct blob_attr *msg);
 
 int hostapd_array_check_id(uint32_t id);
 
-void hostapd_array_insert(uint32_t id);
+void hostapd_array_insert(struct hostapd_sock_entry entry);
+
+struct hostapd_sock_entry hostapd_array_get_entry(uint32_t id);
 
 void hostapd_array_delete(uint32_t id);
 
@@ -235,24 +246,38 @@ void add_client_update_timer(time_t time) {
     uloop_timeout_set(&client_timer, time);
 }
 
+struct hostapd_sock_entry hostapd_array_get_entry(uint32_t id) {
+    for (int i = 0; i <= hostapd_sock_last; i++) {
+        printf("%d: ID: %d\n",i,hostapd_sock_arr[i].id);
+        if (hostapd_sock_arr[i].id == id) {
+            printf("FOUND ENTRY!\n");
+            return hostapd_sock_arr[i];
+        }
+    }
+    struct hostapd_sock_entry ret = {
+        .id = 1
+    };
+    printf("DONT FOUND!!!\n");
+    return ret;
+}
+
 int hostapd_array_check_id(uint32_t id) {
     for (int i = 0; i <= hostapd_sock_last; i++) {
-        if (hostapd_sock_arr[i] == id) {
+        if (hostapd_sock_arr[i].id == id) {
             return 1;
         }
     }
     return 0;
 }
 
-
+void hostapd_array_insert(struct hostapd_sock_entry entry) {
-void hostapd_array_insert(uint32_t id) {
     if (hostapd_sock_last < MAX_HOSTAPD_SOCKETS) {
         hostapd_sock_last++;
-        hostapd_sock_arr[hostapd_sock_last] = id;
+        hostapd_sock_arr[hostapd_sock_last] = entry;
     }
 
     for (int i = 0; i <= hostapd_sock_last; i++) {
-        printf("%d: %d\n", i, hostapd_sock_arr[i]);
+        printf("%d: %d\n", i, hostapd_sock_arr[i].id);
     }
 }
 
@@ -265,7 +290,7 @@ void hostapd_array_delete(uint32_t id) {
     }
 
     for (i = 0; i <= hostapd_sock_last; i++) {
-        if (hostapd_sock_arr[i] == id) {
+        if (hostapd_sock_arr[i].id == id) {
             found_in_array = 1;
             break;
         }
@@ -326,7 +351,7 @@ static void hostapd_handle_remove(struct ubus_context *ctx,
     int ret;
 
     fprintf(stderr, "Object %08x went away\n", id);
-    ret = ubus_unsubscribe(ctx, s, id);
+    ret = ubus_unsubscribe(ctx_clients, s, id);
     if (ret)
         fprintf(stderr, "Removing object %08x: %s\n", id, ubus_strerror(ret));
 
@@ -656,27 +681,64 @@ static int hostapd_notify(struct ubus_context *ctx, struct ubus_object *obj,
     char *str;
     str = blobmsg_format_json(msg, true);
     printf("METHOD new: %s : %s\n", method, str);
-
     free(str);
 
+    // here add bssid!!!
+    printf("SEARCHING CTX: local_id: %d\n",ctx->local_id);
+    printf("SEARCHING OBJECT: id: %d, name: %s Path: %s\n",obj->id, obj->name, obj->path);
+    //printf("SEARCHING OBJECT TYPE: id: %d, name: %s\n",obj->type->id, obj->type->name);
+    printf("SEARCHING FOR: PEER: %d, Object: %d, Seq: %d \n",req->peer, req->object, req->seq);
+    struct hostapd_sock_entry entry = hostapd_array_get_entry(req->peer);
+    if(entry.id != req->peer)
+    {
+        printf("WRRRRRON!\n");
+        //return -1;
+    }
+
+    struct ubus_subscriber *subscriber;
+    subscriber = container_of(obj, struct ubus_subscriber, obj);
+
+    printf("PATH WIH UNPACKING: %s\n", subscriber->obj.path);
+
+    struct blob_attr *cur; int rem;
+    blob_buf_init(&b_notify, 0);
+    blobmsg_for_each_attr(cur, msg, rem){
+        blobmsg_add_blob(&b_notify, cur);
+        //blobmsg_add_blob(&buf, blobmsg_data(tb2[2]));
+
+    }
+
+    //blobmsg_add_macaddr(&b_notify, "bssid", entry.bssid_addr);
+    //blobmsg_add_string(&b_notify, "ssid", entry.iface_name);
+
+    char *blaaa;
+    blaaa = blobmsg_format_json(b_notify.head, true);
+    printf("NNNEW: %s\n", blaaa);
+    free(blaaa);
+    return 0;
+
     if (strncmp(method, "probe", 5) == 0) {
-        return handle_probe_req(msg);
+        return handle_probe_req(b_notify.head);
     } else if (strncmp(method, "auth", 4) == 0) {
-        return handle_auth_req(msg);
+        return handle_auth_req(b_notify.head);
     } else if (strncmp(method, "assoc", 5) == 0) {
-        return handle_assoc_req(msg);
+        return handle_assoc_req(b_notify.head);
     } else if (strncmp(method, "deauth", 6) == 0) {
-        send_blob_attr_via_network(msg, "deauth");
+        send_blob_attr_via_network(b_notify.head, "deauth");
-        return handle_deauth_req(msg);
+        return handle_deauth_req(b_notify.head);
     }
     return 0;
 }
 
 static int add_subscriber(char *name) {
+
+    char subscribe_name[300];
+    sprintf(subscribe_name, "hostapd.%s", name);
+
     uint32_t id = 0;
 
-    if (ubus_lookup_id(ctx, name, &id)) {
+    if (ubus_lookup_id(ctx_clients, subscribe_name, &id)) {
-        fprintf(stderr, "Failed to look up test object for %s\n", name);
+        fprintf(stderr, "Failed to look up test object for %s\n", subscribe_name);
         return -1;
     }
 
@@ -684,10 +746,21 @@ static int add_subscriber(char *name) {
         return 0;
     }
 
-    int ret = ubus_subscribe(ctx, &hostapd_event, id);
+    int ret = ubus_subscribe(ctx_clients, &hostapd_event, id);
-    hostapd_array_insert(id);
+
+    struct hostapd_sock_entry entry =
+            {
+                    .id = id,
+            };
+    strcpy(entry.iface_name, name);
+    hostapd_array_insert(entry);
+
     fprintf(stderr, "Watching object %08x: %s\n", id, ubus_strerror(ret));
 
+    printf("SEARCHING OBJECT: id: %d, name: %s Path: %s\n",hostapd_event.obj.id, hostapd_event.obj.name, hostapd_event.obj.path);
+    //printf("SEARCHING OBJECT TYPE: id: %d, name: %s\n",hostapd_event.obj.type->id, hostapd_event.obj.type->name);
+    //printf("SEARCHING FOR: PEER: %d, Object: %d, Seq: %d \n",req->peer, req->object, req->seq);
+
     // respond to notify...
     respond_to_notify(id);
 
@@ -698,7 +771,7 @@ static int subscribe_to_hostapd_interfaces(const char *hostapd_dir) {
     DIR *dirp;
     struct dirent *entry;
 
-    if (ctx == NULL) {
+    if (ctx_clients == NULL) {
         return 0;
     }
 
@@ -709,23 +782,23 @@ static int subscribe_to_hostapd_interfaces(const char *hostapd_dir) {
     }
     while ((entry = readdir(dirp)) != NULL) {
         if (entry->d_type == DT_SOCK) {
-            char subscribe_name[300];
+            add_subscriber(entry->d_name);
-            sprintf(subscribe_name, "hostapd.%s", entry->d_name);
+            goto finish;
-            add_subscriber(subscribe_name);
         }
     }
+    finish:
     closedir(dirp);
     return 0;
 }
 
 static int subscribe_to_hostapd(const char *hostapd_dir) {
 
-    if (ctx == NULL) {
+    if (ctx_clients == NULL) {
         return 0;
     }
 
     printf("Registering ubus event subscriber!\n");
-    int ret = ubus_register_subscriber(ctx, &hostapd_event);
+    int ret = ubus_register_subscriber(ctx_clients, &hostapd_event);
     if (ret) {
         fprintf(stderr, "Failed to add watch handler: %s\n", ubus_strerror(ret));
         return -1;
@@ -744,15 +817,15 @@ int dawn_init_ubus(const char *ubus_socket, const char *hostapd_dir) {
     uloop_init();
     signal(SIGPIPE, SIG_IGN);
 
-    ctx = ubus_connect(ubus_socket);
+    ctx_clients = ubus_connect(ubus_socket);
-    if (!ctx) {
+    if (!ctx_clients) {
         fprintf(stderr, "Failed to connect to ubus\n");
         return -1;
     } else {
         printf("Connected to ubus\n");
     }
 
-    ubus_add_uloop(ctx);
+    ubus_add_uloop(ctx_clients);
 
     // set dawn metric
     dawn_metric = uci_get_dawn_metric();
@@ -779,12 +852,14 @@ int dawn_init_ubus(const char *ubus_socket, const char *hostapd_dir) {
     if (network_config.network_option == 2)
         run_server(network_config.tcp_port);
 
+    subscribe_to_hostapd_interfaces(hostapd_dir_glob);
+
     uloop_run();
 
 
     close_socket();
 
-    ubus_free(ctx);
+    ubus_free(ctx_clients);
     uloop_done();
     return 0;
 }
@@ -930,6 +1005,15 @@ static void ubus_get_clients_cb(struct ubus_request *req, int type, struct blob_
     blobmsg_add_u32(&b_domain, "collision_domain", network_config.collision_domain);
     blobmsg_add_u32(&b_domain, "bandwidth", network_config.bandwidth);
 
+    printf("SEARCHING FOR: %d\n", req->peer);
+    struct hostapd_sock_entry entry = hostapd_array_get_entry(req->peer);
+    if(entry.id != req->peer)
+    {
+        //return;
+    }
+    blobmsg_add_macaddr(&b_domain, "bssid", entry.bssid_addr);
+    blobmsg_add_string(&b_domain, "SSID", entry.iface_name);
+
     //char* collision_string = blobmsg_format_json(b_domain.head, 1);
 
     send_blob_attr_via_network(b_domain.head, "clients");
@@ -944,7 +1028,7 @@ static void ubus_get_clients_cb(struct ubus_request *req, int type, struct blob_
 static int ubus_get_clients() {
     for (int i = 0; i <= hostapd_sock_last; i++) {
         int timeout = 1;
-        ubus_invoke(ctx_clients, hostapd_sock_arr[i], "get_clients", NULL, ubus_get_clients_cb, NULL, timeout * 1000);
+        ubus_invoke(ctx_clients, hostapd_sock_arr[i].id, "get_clients", NULL, ubus_get_clients_cb, NULL, timeout * 1000);
     }
     return 0;
 }
@@ -966,7 +1050,7 @@ void start_umdns_update() {
 }
 
 void update_hostapd_sockets(struct uloop_timeout *t) {
-    subscribe_to_hostapd_interfaces(hostapd_dir_glob);
+    //subscribe_to_hostapd_interfaces(hostapd_dir_glob);
     uloop_timeout_set(&hostapd_timer, timeout_config.update_hostapd * 1000);
 }
 
@@ -979,7 +1063,7 @@ void del_client_all_interfaces(const uint8_t *client_addr, uint32_t reason, uint
 
     for (int i = 0; i <= hostapd_sock_last; i++) {
         int timeout = 1;
-        ubus_invoke(ctx_clients, hostapd_sock_arr[i], "del_client", b.head, NULL, NULL, timeout * 1000);
+        ubus_invoke(ctx_clients, hostapd_sock_arr[i].id, "del_client", b.head, NULL, NULL, timeout * 1000);
     }
 }
 
@@ -1031,7 +1115,7 @@ static void ubus_umdns_cb(struct ubus_request *req, int type, struct blob_attr *
 
 int ubus_call_umdns() {
     u_int32_t id;
-    if (ubus_lookup_id(ctx, "umdns", &id)) {
+    if (ubus_lookup_id(ctx_clients, "umdns", &id)) {
         fprintf(stderr, "Failed to look up test object for %s\n", "umdns");
         return -1;
     }
@@ -1137,7 +1221,7 @@ static int get_hearing_map(struct ubus_context *ctx, struct ubus_object *obj,
     int ret;
 
     build_hearing_map_sort_client(&b);
-    ret = ubus_send_reply(ctx, req, b.head);
+    ret = ubus_send_reply(ctx_clients, req, b.head);
     if (ret)
         fprintf(stderr, "Failed to send reply: %s\n", ubus_strerror(ret));
     return 0;
@@ -1150,7 +1234,7 @@ static int get_network(struct ubus_context *ctx, struct ubus_object *obj,
     int ret;
 
     build_network_overview(&b);
-    ret = ubus_send_reply(ctx, req, b.head);
+    ret = ubus_send_reply(ctx_clients, req, b.head);
     if (ret)
         fprintf(stderr, "Failed to send reply: %s\n", ubus_strerror(ret));
     return 0;
@@ -1159,7 +1243,7 @@ static int get_network(struct ubus_context *ctx, struct ubus_object *obj,
 static void ubus_add_oject() {
     int ret;
 
-    ret = ubus_add_object(ctx, &dawn_object);
+    ret = ubus_add_object(ctx_clients, &dawn_object);
     if (ret)
         fprintf(stderr, "Failed to add object: %s\n", ubus_strerror(ret));
 }
@@ -1174,7 +1258,7 @@ static void respond_to_notify(uint32_t id) {
     blobmsg_add_u32(&b, "notify_response", 1);
 
     int timeout = 1;
-    ret = ubus_invoke(ctx, id, "notify_response", b.head, NULL, NULL, timeout * 1000);
+    ret = ubus_invoke(ctx_clients, id, "notify_response", b.head, NULL, NULL, timeout * 1000);
     if (ret)
         fprintf(stderr, "Failed to invoke: %s\n", ubus_strerror(ret));
 }