X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=server.c;fp=server.c;h=a7c4f15c62c775b8578329761acca92dcb81d99c;hb=96c58e8ba51d67d1d90660ba8ff4f597c03688fe;hp=f43f41491913d80e0db59c637feb303c9e0c1aa2;hpb=b8c78f5c0da93d92aa28d3ef3757e78d03141f41;p=catta

diff --git a/server.c b/server.c
index f43f414..a7c4f15 100644
--- a/server.c
+++ b/server.c
@@ -128,7 +128,6 @@ static void withdraw_entry(flxServer *s, flxEntry *e) {
     }
 
     s->need_entry_cleanup = TRUE;
-
 }
 
 static void incoming_probe(flxServer *s, flxRecord *record, flxInterface *i) {
@@ -141,23 +140,24 @@ static void incoming_probe(flxServer *s, flxRecord *record, flxInterface *i) {
 
     t = flx_record_to_string(record);
 
-    g_message("PROBE! PROBE! PROBE! [%s]", t);
-    
+/*     g_message("PROBE: [%s]", t); */
 
+    
     for (e = g_hash_table_lookup(s->entries_by_key, record->key); e; e = n) {
         n = e->by_key_next;
-        
-        if (e->dead || !flx_record_equal_no_ttl(record, e->record))
+
+        if (e->dead || flx_record_equal_no_ttl(record, e->record))
             continue;
 
         if (flx_entry_registering(s, e, i)) {
             gint cmp;
-            
+
             if ((cmp = flx_record_lexicographical_compare(record, e->record)) > 0) {
                 withdraw_entry(s, e);
                 g_message("Recieved conflicting probe [%s]. Local host lost. Withdrawing.", t);
             } else if (cmp < 0)
                 g_message("Recieved conflicting probe [%s]. Local host won.", t);
+
         }
     }
 
@@ -227,7 +227,7 @@ static gboolean handle_conflict(flxServer *s, flxInterface *i, flxRecord *record
 
     t = flx_record_to_string(record);
 
-    g_message("CHECKING FOR CONFLICT: [%s]", t);
+/*     g_message("CHECKING FOR CONFLICT: [%s]", t); */
 
     for (e = g_hash_table_lookup(s->entries_by_key, record->key); e; e = n) {
         n = e->by_key_next;
@@ -451,7 +451,7 @@ static void add_default_entries(flxServer *s) {
     uname(&utsname);
     r->data.hinfo.cpu = g_strdup(g_strup(utsname.machine));
     r->data.hinfo.os = g_strdup(g_strup(utsname.sysname));
-    flx_server_add(s, NULL, 0, AF_UNSPEC, FLX_ENTRY_UNIQUE | FLX_ENTRY_NOANNOUNCE | FLX_ENTRY_NOPROBE, r);
+    flx_server_add(s, NULL, 0, AF_UNSPEC, FLX_ENTRY_UNIQUE, r);
     flx_record_unref(r);
 
     /* Add localhost entries */