Changeset d45051e in code

Timestamp:

Jun 17, 2014, 11:31:02 AM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

9440414

Parents:

383d37b

git-author:

Mike Belopuhov <mike@…> (06/17/14 11:30:10)

git-committer:

Mike Belopuhov <mike@…> (06/17/14 11:31:02)

Message:

make sure to abort bufferevent processing after icbd_drop was called

Files:

• icb.c (modified) (10 diffs)
• icb.h (modified) (1 diff)
• icbd.c (modified) (1 diff)

icb.c

@@ -35 +35 @@
 void   icb_command(struct icb_session *, char *, char *);
 void   icb_groupmsg(struct icb_session *, char *);
-void   icb_login(struct icb_session *, char *, char *, char *);
+int    icb_login(struct icb_session *, char *, char *, char *);
 int    icb_dowho(struct icb_session *, struct icb_group *);
 char  *icb_nextfield(char **, int);
@@ -71 +71 @@
  *  icb_input: main input processing routine
  */
-void
+int
 icb_input(struct icb_session *is)
 {
         char *msg = is->buffer;
         unsigned char type;
+        int res = 0;
 
         is->last = getmonotime();
@@ -82 +83 @@
         if (!ISSETF(is->flags, ICB_SF_LOGGEDIN) && type != ICB_M_LOGIN) {
                 icb_error(is, "Not logged in");
-                return;
+                return (0);
         }
         switch (type) {
@@ -95 +96 @@
                         icb_error(is, "Command not implemented");
                         icbd_drop(is, NULL);
-                        return;
+                        return (1);
                 }
                 if (strlen(cmd) == 0 || strcmp(cmd, "login") != 0) {
                         icb_error(is, "Malformed login packet");
                         icbd_drop(is, NULL);
-                        return;
-                }
-                icb_login(is, group, nick, client);
+                        return (1);
+                }
+                res = icb_login(is, group, nick, client);
                 break;
         }
@@ -132 +133 @@
                 icb_error(is, "Undefined message type %u", type);
         }
+        return (res);
 }
 
@@ -137 +139 @@
  *  icb_login: handles login ('a') packets
  */
-void
+int
 icb_login(struct icb_session *is, char *grp, char *nick, char *client)
 {
@@ -149 +151 @@
                 icb_error(is, "Invalid nick");
                 icbd_drop(is, NULL);
-                return;
+                return (1);
         }
         if (!grp || strlen(grp) == 0)
@@ -163 +165 @@
                         icb_error(is, "Invalid group %s", group);
                         icbd_drop(is, NULL);
-                        return;
+                        return (1);
                 } else {
                         if ((ig = icb_addgroup(is, group, NULL)) == NULL) {
                                 icb_error(is, "Can't create group %s", group);
-                                return;
+                                return (0);
                         }
                         icbd_log(NULL, LOG_DEBUG, "%s created group %s",
@@ -177 +179 @@
                         icb_error(is, "Nick is already in use");
                         icbd_drop(is, NULL);
-                        return;
+                        return (1);
                 }
         }
@@ -207 +209 @@
                 icb_status(is, STATUS_TOPIC, "Topic for %s is \"%s\"",
                     ig->name, ig->topic);
+        return (0);
 }
 

icb.h

@@ -125 +125 @@
 void            icb_error(struct icb_session *, const char *, ...);
 void            icb_init(void);
-void            icb_input(struct icb_session *);
+int             icb_input(struct icb_session *);
 inline int      icb_ismod(struct icb_group *, struct icb_session *);
 int             icb_modpermit(struct icb_session *, int);

icbd.c

@@ -386 +386 @@
                 is->buffer[MIN(is->rlen, ICB_MSGSIZE - 1)] = '\0';
                 /* process the message in full */
-                icb_input(is);
+                if (icb_input(is))
+                        return;
                 is->rlen = is->length = 0;
         }