add record as an argument to the conflict function

diff --git a/mdnsd.c b/mdnsd.c
index edb8e7337b835952a27bebd749728abde5d5427a..6f134e0e6d0aff163d7c3f517320c8bdf13976b5 100644 (file)
--- a/mdnsd.c
+++ b/mdnsd.c
@@ -51,7 +51,7 @@ struct mdnsdr_struct
     struct mdnsda_struct rr;
     char unique; // # of checks performed to ensure
     int tries;
-    void (*conflict)(char *, int, void *);
+    void (*conflict)(mdnsdr r, char *, int, void *);
     void *arg;
     struct mdnsdr_struct *next, *list;
 };
@@ -256,7 +256,7 @@ void _q_answer(mdnsd d, struct cached *c)
 
 void _conflict(mdnsd d, mdnsdr r)
 {
-    r->conflict(r->rr.name,r->rr.type,r->arg);
+    r->conflict(r, r->rr.name,r->rr.type,r->arg);
     mdnsd_done(d,r);
 }
 
@@ -508,8 +508,6 @@ void mdnsd_in(mdnsd d, struct message *m, unsigned long int ip, unsigned short i
 
     if(d->shutdown) return;
 
-    mdnsd_dump (stderr, m, "incoming");
-
     gettimeofday(&d->now,0);
 
     if(m->header.qr == 0)
@@ -822,7 +820,7 @@ mdnsdr mdnsd_shared(mdnsd d, char *host, int type, long int ttl)
     return r;
 }
 
-mdnsdr mdnsd_unique(mdnsd d, char *host, int type, long int ttl, void (*conflict)(char *host, int type, void *arg), void *arg)
+mdnsdr mdnsd_unique(mdnsd d, char *host, int type, long int ttl, void (*conflict)(mdnsdr r, char *host, int type, void *arg), void *arg)
 {
     mdnsdr r;
     r = mdnsd_shared(d,host,type,ttl);

diff --git a/mdnsd.h b/mdnsd.h
index d7afb2ce36d1d4ec5bf1833d4b837f7118622490..636ebbfbebcc479a2b11f16c99ee084cb75d4689 100644 (file)
--- a/mdnsd.h
+++ b/mdnsd.h
@@ -69,7 +69,7 @@ mdnsda mdnsd_list(mdnsd d, char *host, int type, mdnsda last);
 // create a new unique record (try mdnsda_list first to make sure it's not used)
 //   conflict(arg) called at any point when one is detected and unable to recover
 //   after the first data is set_*(), any future changes effectively expire the old one and attempt to create a new unique record
-mdnsdr mdnsd_unique(mdnsd d, char *host, int type, long int ttl, void (*conflict)(char *host, int type, void *arg), void *arg);
+mdnsdr mdnsd_unique(mdnsd d, char *host, int type, long int ttl, void (*conflict)(mdnsdr r, char *host, int type, void *arg), void *arg);
 // 
 // create a new shared record
 mdnsdr mdnsd_shared(mdnsd d, char *host, int type, long int ttl);