Cleanup code so it builds with C++ again

[ircu2.10.12-pk.git] / ircd / uping.c

diff --git a/ircd/uping.c b/ircd/uping.c
index a83c57ed424817fe6a1ae5e9e290de01270fc08c..3e69622b052d5ace3607ae7b8b25c592a48fe4be 100644 (file)
--- a/ircd/uping.c
+++ b/ircd/uping.c
@@ -94,7 +94,7 @@ static void uping_erase(struct UPing* p)
 /* Called when the event engine detects activity on the UPing socket */
 static void uping_echo_callback(struct Event* ev)
 {
-  assert(ev_type(ev) == ET_READ);
+  assert(ev_type(ev) == ET_READ || ev_type(ev) == ET_ERROR);
 
   uping_echo();
 }
@@ -193,7 +193,7 @@ static void uping_read_callback(struct Event* ev)
   assert(0 != ev_socket(ev));
   assert(0 != s_data(ev_socket(ev)));
 
-  pptr = s_data(ev_socket(ev));
+  pptr = (struct UPing*) s_data(ev_socket(ev));
 
   Debug((DEBUG_SEND, "uping_read_callback called, %p (%d)", pptr,
         ev_type(ev)));
@@ -204,7 +204,7 @@ static void uping_read_callback(struct Event* ev)
     if (!pptr->freeable)
       MyFree(pptr); /* done with it, finally */
   } else {
-    assert(ev_type(ev) == ET_READ);
+    assert(ev_type(ev) == ET_READ || ev_type(ev) == ET_ERROR);
 
     uping_read(pptr); /* read uping response */
   }
@@ -218,7 +218,7 @@ static void uping_sender_callback(struct Event* ev)
   assert(0 != ev_timer(ev));
   assert(0 != t_data(ev_timer(ev)));
 
-  pptr = t_data(ev_timer(ev));
+  pptr = (struct UPing*) t_data(ev_timer(ev));
 
   Debug((DEBUG_SEND, "uping_sender_callback called, %p (%d)", pptr,
         ev_type(ev)));
@@ -247,7 +247,7 @@ static void uping_killer_callback(struct Event* ev)
   assert(0 != ev_timer(ev));
   assert(0 != t_data(ev_timer(ev)));
 
-  pptr = t_data(ev_timer(ev));
+  pptr = (struct UPing*) t_data(ev_timer(ev));
 
   Debug((DEBUG_SEND, "uping_killer_callback called, %p (%d)", pptr,
         ev_type(ev)));
@@ -271,9 +271,9 @@ static void uping_start(struct UPing* pptr)
 {
   assert(0 != pptr);
 
-  timer_add(&pptr->sender, uping_sender_callback, (void*) pptr,
+  timer_add(timer_init(&pptr->sender), uping_sender_callback, (void*) pptr,
            TT_PERIODIC, 1);
-  timer_add(&pptr->killer, uping_killer_callback, (void*) pptr,
+  timer_add(timer_init(&pptr->killer), uping_killer_callback, (void*) pptr,
            TT_RELATIVE, UPINGTIMEOUT);
   pptr->freeable |= UPING_PENDING_SENDER | UPING_PENDING_KILLER;