fix backend #705

[catta] / src / server.c

diff --git a/src/server.c b/src/server.c
index 5a9e050b71c20f5d99413f4cff3165d212076feb..b3971962df5bb719742e3e61583db76471c90aa9 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -899,9 +899,12 @@ static void dispatch_packet(CattaServer *s, CattaDnsPacket *p, const CattaAddres
     assert(iface > 0);
     assert(src_address->proto == dst_address->proto);
 
-    if (!(i = catta_interface_monitor_get_interface(s->monitor, iface, src_address->proto)) ||
-        !i->announcing) {
-        catta_log_warn("Received packet from invalid interface.");
+    if (!(i = catta_interface_monitor_get_interface(s->monitor, iface, src_address->proto))) {
+        catta_log_warn("Received packet from unrecognized interface (%d).", iface);
+        return;
+    }
+    if (!i->announcing) {
+        catta_log_warn("Received packet from invalid interface %d (not announcing).", iface);
         return;
     }
 
@@ -1217,7 +1220,7 @@ static void register_stuff(CattaServer *s) {
     assert(s);
 
     server_set_state(s, CATTA_SERVER_REGISTERING);
-    s->n_host_rr_pending ++; /** Make sure that the state isn't changed tp CATTA_SERVER_RUNNING too early */
+    s->n_host_rr_pending ++; /** Make sure that the state isn't changed to CATTA_SERVER_RUNNING too early */
 
     register_hinfo(s);
     register_browse_domain(s);
@@ -1225,9 +1228,6 @@ static void register_stuff(CattaServer *s) {
 
     assert(s->n_host_rr_pending > 0);
     s->n_host_rr_pending --;
-
-    if (s->n_host_rr_pending == 0)
-        server_set_state(s, CATTA_SERVER_RUNNING);
 }
 
 static void update_fqdn(CattaServer *s) {