Author: Perry Lorier <isomer@coders.net>

Log message:

Minor changes.

Fixed bug in m_mode() thanks poptix.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@218 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index b232630118a5050be28775f81e40af67ff65df97..95760af7cc946eaa114397643a88ab2e7f398f3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-29  Perry Lorier <isomer@coders.net>
+       * ircd/s_bsd.c: Sigh. :)
+        * ircd/m_mode.c: fix for modeless channels by poptix.
+
 2000-04-29  Kevin L. Mitchell  <klmitch@mit.edu>
 
        * ircd/m_join.c: reimplement JOIN in terms of struct JoinBuf
@@ -16,10 +20,10 @@
        JoinBuf abstraction
 
 2000-04-29  Perry Lorier <isomer@coders.net>
-       * include/s_bsd.c: Ok, so I thought I compiled and tested this...
+       * ircd/s_bsd.c: Ok, so I thought I compiled and tested this...
 
 2000-04-29  Perry Lorier <isomer@coders.net>
-       * include/s_bsd.c: Add debugging code to IPcheck
+       * ircd/s_bsd.c: Add debugging code to IPcheck
 
 2000-04-28  Kevin L. Mitchell  <klmitch@mit.edu>
 
@@ -992,7 +996,7 @@
 #
 # ChangeLog for ircu2.10.11
 #
-# $Id: ChangeLog,v 1.115 2000-04-30 01:33:27 kev Exp $
+# $Id: ChangeLog,v 1.116 2000-04-30 06:37:52 isomer Exp $
 #
 # Insert new changes at beginning of the change list.
 #

diff --git a/ircd/listener.c b/ircd/listener.c
index ce7ddc7065a8aa66762fe2cb36cddde00f95634f..3366052862e71333182c64614f8d38c899f8654d 100644 (file)
--- a/ircd/listener.c
+++ b/ircd/listener.c
@@ -412,8 +412,9 @@ void accept_connection(struct Listener* listener)
    * point, just assume that connections cannot
    * be accepted until some old is closed first.
    */
-  if (-1 == (fd = accept(listener->fd, (struct sockaddr*) &addr, &addrlen)))
+  if (-1 == (fd = accept(listener->fd, (struct sockaddr*) &addr, &addrlen))) {
     return;
+  }
   /*
    * check for connection limit
    */

diff --git a/ircd/m_mode.c b/ircd/m_mode.c
index ac2c81201f58b7804fa4d5ebfe7f3f6c268aea62..e3c6a21a4d9e35744732c1d131b8186cdd5fa6b0 100644 (file)
--- a/ircd/m_mode.c
+++ b/ircd/m_mode.c
@@ -111,7 +111,8 @@ m_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
 
   clean_channelname(parv[1]);
 
-  if (('#' != *parv[1] && '&' != *parv[1]) || !(chptr = FindChannel(parv[1])))
+  if (('#' != *parv[1] && '&' != *parv[1] && '+' != *parv[1]) || 
+      !(chptr = FindChannel(parv[1])))
     return set_user_mode(cptr, sptr, parc, parv);
 
   sptr->flags &= ~FLAGS_TS8;
@@ -165,7 +166,7 @@ ms_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
   if (IsLocalChannel(parv[1]))
     return 0;
 
-  if ('#' != *parv[1] || !(chptr = FindChannel(parv[1])))
+  if (('#' != *parv[1] && '+' != *parv[1])|| !(chptr = FindChannel(parv[1])))
     return set_user_mode(cptr, sptr, parc, parv);
 
   sptr->flags &= ~FLAGS_TS8;
@@ -238,7 +239,7 @@ int m_mode(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   /* 
    * try to find the channel
    */
-  if ('#' == *parv[1] || '&' == *parv[1])
+  if ('#' == *parv[1] || '&' == *parv[1] || '+' == *parv[1])
     chptr = FindChannel(parv[1]);
   if (!chptr)
     return set_user_mode(cptr, sptr, parc, parv);
@@ -338,7 +339,7 @@ int ms_mode(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   /* 
    * try to find the channel
    */
-  if ('#' == *parv[1] || '&' == *parv[1])
+  if ('#' == *parv[1] || '&' == *parv[1] || '+' == *parv[1])
     chptr = FindChannel(parv[1]);
   if (!chptr)
     return set_user_mode(cptr, sptr, parc, parv);
@@ -439,7 +440,7 @@ int m_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
   /* 
    * try to find the channel
    */
-  if ('#' == *parv[1] || '&' == *parv[1])
+  if ('#' == *parv[1] || '&' == *parv[1] || '+' == *parv[1])
     chptr = FindChannel(parv[1]);
   if (!chptr)
     return set_user_mode(cptr, sptr, parc, parv);

diff --git a/ircd/s_bsd.c b/ircd/s_bsd.c
index 4cf0dd1099494ff9d16bd69cd0316e8fe6b408f0..b7d7b46d286293d11d04dac2ff4e9d30d20ed53a 100644 (file)
--- a/ircd/s_bsd.c
+++ b/ircd/s_bsd.c
@@ -581,9 +581,9 @@ void add_connection(struct Listener* listener, int fd)
   if (!IPcheck_local_connect(addr.sin_addr, &next_target) && !listener->server) {
 #ifdef IPCHECKDEBUG     
    char buff[512];
-   snprintf(buff,512,"\n%s [%i connections active]\n",
-       throttle_message,
-       IPcheck_nr(addr.sin_addr));
+   snprintf(buff,512,"\n\rNOTICE * :IPCheck=%i connections active\n\r%s",
+       IPcheck_nr(cptr),
+       throttle_message);
    buff[511]=0;
    send(fd,buff,strlen(buff),0);
 #else