Changeset 1684

Timestamp:

02/22/10 12:25:48 (7 months ago)

Author:

swalsh

Message:

Add the beginnings of the event system rewrite, and also more importantly fix a bug in the processing of auto-auth; oh and while we're at it [MERGE] (r1683) fix crash bug in nickname changing

Location:

trunk

Files:

• . (modified) (1 prop)
• include/events.h (added)
• modules/nickserv.c (modified) (4 diffs)
• modules/oftc.c (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• src/event.c (added)
• src/services.c (modified) (2 diffs)

trunk/modules/nickserv.c

@@ -1776 +1776 @@
     else if(client != NULL)
     {
-      if((target = find_client(nickname_get_nick(client->nickname))) != NULL)
+      if((target = find_client(nickname_get_nick(user->release_name))) != NULL)
       {
         if(target != client)
@@ -2043 +2043 @@
 ns_on_auth_requested(va_list args)
 {
+  char *use_cert = va_arg(args, char *);
   char *user    = va_arg(args, char *);
   char *n       = va_arg(args, char *);
@@ -2071 +2072 @@
     else
     {
-      if(!nickname_cert_check(nick, certfp, NULL))
+      if(*use_cert == '1')
+      {
+        if(!nickname_cert_check(nick, certfp, NULL))
+          send_auth_reply(nickserv, user, n, 0, "Authentication Failed");
+        else
+          send_auth_reply(nickserv, user, n, 1, "Success");
+      }
+      else
       {
         if(!check_nick_pass(NULL, nick, certfp))
@@ -2078 +2086 @@
           send_auth_reply(nickserv, user, n, 1, "Success");
       }
-      else
-        send_auth_reply(nickserv, user, n, 1, "Success");
-    
       nickname_free(nick);
     }
-
-  }
-  
+  }
   return pass_callback(ns_on_auth_req_hook, user);
 }

trunk/modules/oftc.c

@@ -308 +308 @@
 }
 
+/* irc.example.com AUTH 1|0 account nick cert|pass */
 static void
 m_auth(struct Client *client, struct Client *source, int parc, char *parv[])
 {
-  ilog(L_DEBUG, "AUTH request for %s[%s] certfp %s from %s", parv[1], 
-      parv[2], parv[3], parv[0]);
-
-  execute_callback(on_auth_request_cb, parv[1], parv[2], parv[3]);
+  ilog(L_DEBUG, "AUTH request for %s[%s] %s %s from %s", parv[2], 
+      parv[3], *parv[1] == '1' ? "CERT" : "PASS", parv[4], parv[0]);
+
+  execute_callback(on_auth_request_cb, parv[1], parv[2], parv[3], parv[4]);
 }
 

trunk/src/Makefile.am

@@ -21 +21 @@
                                                                         dbm.c                                   \
                                                                         dbmail.c                              \
+                                                                        event.c                                                 \
                   group.c             \
                   groupaccess.c       \
@@ -38 +39 @@
 
 services_LDADD=conf/libconf.a $(top_srcdir)/libio/libio.a @LIBLTDL@
-services_LDFLAGS=
+services_LDFLAGS=-levent
 if USE_RUBY
 services_LDFLAGS+=@RUBY_LDFLAGS@

trunk/src/services.c

@@ -39 +39 @@
 #include "mqueue.h"
 #include "send.h"
+#include "events.h"
 
 #include <signal.h>
@@ -209 +210 @@
   memset(&me, 0, sizeof(me));
 
+  init_events();
   libio_init(!ServicesState.foreground);
   iorecv_cb = register_callback("iorecv", iorecv_default);