Author: jseter

CHANGES

@@ -1,3 +1,18 @@
+2.8.8
+(1) Added support for setting a specific IP to listen on 
+    (listen <[host:]port> [maxusers])
+(2) Enhanced bncsetup to use new conf format and new question to handle
+    specific host entering.
+(3) Changed the Makefile to list libraries last, some crypt libraries
+    predefined their own main function which prevented compiling.
+(4) Reorganized the connection code to fix a bug where a user gets
+    disconnected while connecting to an irc server.
+(5) Socket length was not being set before accept. (Thanks chris)
+(6) Removed old hack code for systems that do not support snprintf.
+(7) Increased error checking in recv code.
+(8) Better parsing of messages
+(9) Server buffers always cleared when connecting to a new server.
+
 2.8.6
 (1) Bnc now lists all docked sessions
 (2) Rewrote the send/recv code

Makefile.in

@@ -1,30 +1,29 @@
-LIBS = @LIBS@
-OPTS = -O3
-COPT = -Wall
-OOPT =
-STRIP = strip
-CC = gcc
+LIBS=@LIBS@
+CFLAGS=-O3 -Wall
+OFLAGS=-O3
+CC=@CC@
 
 ALL: bnc mkpasswd
 
 mkpasswd:mkpasswd.c
-	${CC} ${OPTS} ${COPT} ${LIBS} -o mkpasswd mkpasswd.c
-bnc: bnc.o conf.o server.o cmds.o send.o sbuf.o Makefile
-	${CC} ${OPTS} ${OOPT} -o bnc bnc.o conf.o server.o cmds.o sbuf.o send.o ${LIBS}
-#	${STRIP} bnc
+	${CC} ${CFLAGS} -o mkpasswd mkpasswd.c ${LIBS} 
+bnc: bnc.o conf.o server.o cmds.o ctcp.o send.o sbuf.o Makefile
+	${CC} ${OFLAGS} -o bnc bnc.o conf.o server.o cmds.o ctcp.o sbuf.o send.o ${LIBS}
 
 bnc.o: config.h struct.h bnc.c Makefile
-	${CC} ${OPTS} ${COPT} -c bnc.c
+	${CC} ${CFLAGS} -c bnc.c
 conf.o: config.h struct.h conf.c Makefile
-	${CC} ${OPTS} ${COPT} -c conf.c
+	${CC} ${CFLAGS} -c conf.c
 cmds.o: config.h struct.h cmds.c Makefile
-	${CC} ${OPTS} ${COPT} -c cmds.c
+	${CC} ${CFLAGS} -c cmds.c
+ctcp.o: config.h ctcp.c Makefile
+	${CC} ${CFLAGS} -c ctcp.c
 server.o: config.h struct.h server.c Makefile
-	${CC} ${OPTS} ${COPT} -c server.c
+	${CC} ${CFLAGS} -c server.c
 send.o: send.c send.h Makefile
-	${CC} ${OPTS} ${COPT} -c send.c
+	${CC} ${CFLAGS} -c send.c
 sbuf.o: sbuf.c
-	${CC} ${OPTS} ${COPT} -c sbuf.c
+	${CC} ${CFLAGS} -c sbuf.c
 
 clean:
 	rm -rf *.o *~ core bnc mkpasswd

README

@@ -6,7 +6,7 @@
    \  \_______/  \  \__\\  \ __\  \  \_______\
     \/_______/    \/__/   \/__/    \/_______/   IRC PROXY
 
-BNC 2.8.6 (c) 1998-2002 by James Seter AKA Pharos on efnet
+BNC 2.8.8 (c) 1998-2002 by James Seter AKA Pharos on efnet
 Site:
   http://gotbnc.com
 

bnc.c

@@ -38,7 +38,7 @@ extern int initproxy (confetti * jr);
 
 extern char buffer[];
 
-
+#if 0
 int bnclog (confetti * jr, char *logbuff)
 {
   static long tata;
@@ -48,7 +48,7 @@ int bnclog (confetti * jr, char *logbuff)
   if (jr->logf != 1)
     return 0;
   tata = time ((long *) 0);
-  snprintf (tmpa, 40, "%s", ctime (&tata));
+  sprintf(tmpa, "%.26s", ctime (&tata));
   for (p = 0; p < 40; p++)
   {
     switch (tmpa[p])
@@ -66,6 +66,8 @@ int bnclog (confetti * jr, char *logbuff)
   fflush (jr->logfile);
   return 0;
 }
+#endif
+
 struct deathwish
 {
 	int reason;
@@ -178,18 +180,21 @@ int main (int argc, char **argv)
 		bnckill (tmps);
 	}
 
-	printf ("--Configuration:\n");
-	printf ("    Daemon port......: %u\n    Maxusers.........: %u\n    Default conn port: %u\n    Pid File.........: %s\n",
-		bncconf.dport, bncconf.maxusers, bncconf.cport, bncconf.pidfile);
+	printf("--Configuration:\n");
+	if(*bncconf.dhost)
+		printf("    Daemon host......: %s\n", bncconf.dhost);	
+	printf("    Daemon port......: %u\n", bncconf.dport);
+	if(bncconf.maxusers == 0)
+		printf("    Maxusers.........: unlimited\n");
+	else
+		printf("    Maxusers.........: %u\n", bncconf.maxusers);
+	printf("    Default conn port: %u\n", bncconf.cport);
+	printf("    Pid File.........: %s\n", bncconf.pidfile);
 
 	if (bncconf.vhostdefault[0] == '\0')
-	{
-		printf ("    Vhost Default....: -SYSTEM DEFAULT-\n");
-	}
+		printf("    Vhost Default....: -SYSTEM DEFAULT-\n");
 	else
-	{
-		printf ("    Vhost Default....: %s\n", bncconf.vhostdefault);
-	}
+		printf("    Vhost Default....: %s\n", bncconf.vhostdefault);
 
 	if (bncconf.vhostlist != NULL)
 	{

bncsetup

@@ -4,7 +4,7 @@ MYPID=$$
 TMPFILE=.bnc$MYPID.tmp
 RSLFILE=.bnc$MYPID.rsl
 VHTFILE=.bnc$MYPID.vht
-BSVERSION="0.3 for BNC2.6.4"
+BSVERSION="0.4 for BNC2.8.8"
 SAVEFILE=./bnc.conf
 
 bsclean()
@@ -16,29 +16,51 @@ bsclean()
 saveit()
 {
 echo "Writing your configuration to $SAVEFILE"
+
+if [ -z $BNCHOST ]
+then
+BNCHOST="$BNCPORT"
+else
+BNCHOST="$BNCHOST:$BNCPORT"
+fi
+
+if [ -z $BNCPASS ]
+then
+usepass=
+else
+usepass="password $BNCPASS"
+fi
+
 cat << EOF > $TMPFILE
 #!/home/myhome/bnc
 # BNCSetup $BSVERSION by IceWizard and pharos
 # automaticly generated configuration file.
-# edit the first line and chmod +x this file if you like to load bnc
-# by running its .conf file
-#               Here are additional options you may add:
-# C:6667                        Default Irc Server Port to Connect to
-# X:default.vhost.com           Default Virtual Host to Use
-# V:another.vhost.com           Other Vhosts That Can Be Used
-# V:different.vhost.com          As Many Vhosts as You Want
-# P:pid.bnc                     Name of PID File
-#                                *NOTE PID file is required if bnc is to be
-#                                *used with crontab
-# L:bnc.log                     Name of Log File
-# W:1                           enable dynamic idents on servers with
-#                                identwd installed
-# A:1:*.addy.net                Allow list of ip addresses that can use BNC
-S:$SUPERPASS
-D:$BNCPORT:$MAXUSERS:$BNCPASS
-
+# <REQUIRED>
+# listen <port> [maxusers]	Port to listen for connections on
+# adminpass <password>		Password for Supervisor Access	
+#
+# [Optional]
+# password <password>		Password required for general connection (recommended)
+# allow <address> [address ...]	list of ip/dns's that can use the bnc
+# vhost <address> [address ...] Other Vhosts That Can Be Used (display only)
+# defaultvhost <address>	Default Virtual Host to Use
+# pidfile <filename>		Name of PID File (recommended if you use crontab)
+# motdfile <filename>		Message of the day, displayed on connection of valid user
+# logfile <filename>		Filename where to store logs
+#
+# EXAMPLE CONFIG - CHANGE THIS:
+# if your pass starts with + it is encrypted, if not it is a normal pass
+#
+listen $BNCHOST $MAXUSERS
+adminpass $SUPERPASS
+$usepass
 EOF
 
+# S:$SUPERPASS
+# D:$BNCPORT:$MAXUSERS:$BNCPASS
+
+
+
 cat $TMPFILE $VHTFILE > $SAVEFILE
 echo "Finished! You may now edit $SAVEFILE to make any special changes"
 
@@ -129,6 +151,21 @@ do
   fi
 done
 
+BNCHOST=
+cat << EOF > $TMPFILE
+Enter the host IP or DNS that bnc will use.
+EOF
+
+dialog --yesno "Enter a host for BNC to listen on (default all hosts)?" 5 60
+ERRORLEVEL=$?
+
+if [ x$ERRORLEVEL = x0 ]
+then 
+  dialog --title "Enter host" --inputbox "$(cat $TMPFILE)" 10 62 2> $RSLFILE
+  BNCHOST="$(head -1 $RSLFILE)"
+fi
+
+
 
 cat << EOF > $TMPFILE
 How many users would you like to be allowed on BNC at the same time?
@@ -243,15 +280,15 @@ BDONE=
     then
       if ! [ x$BDONE = xq ]
       then
-        echo "A:1:$BDONE" >> $VHTFILE
+        echo "allow $BDONE" >> $VHTFILE
       fi
     fi
   done
 fi
 
 if ! [ -e "$VHTFILE" ]
 then
-  echo "A:1:*" > $VHTFILE
+  echo "allow *" > $VHTFILE
 fi
 
 
@@ -268,7 +305,7 @@ then
   BDONE="$(head -1 $RSLFILE)"
   if ! [ -z BDONE ]
   then
-    echo "X:$BDONE" >> $VHTFILE
+    echo "defaultvhost $BDONE" >> $VHTFILE
   fi
 fi
 
@@ -294,7 +331,7 @@ BDONE=
     then
       if ! [ x$BDONE = xq ]
       then
-        echo "V:$BDONE" >> $VHTFILE
+        echo "vhost $BDONE" >> $VHTFILE
       fi
     fi
   done
@@ -316,7 +353,7 @@ then
   BDONE="$(head -1 $RSLFILE)"
   if ! [ -z BDONE ]
   then
-    echo "L:$BDONE" >> $VHTFILE
+    echo "logfile $BDONE" >> $VHTFILE
   fi
 fi
 
@@ -331,19 +368,19 @@ EOF
 
 if [ x$ERRORLEVEL = x0 ]
 then 
-  dialog --title "Enter logfile Filename" --inputbox "$(cat $TMPFILE)" 10 62 "motd" 2> $RSLFILE
+  dialog --title "Enter motd Filename" --inputbox "$(cat $TMPFILE)" 10 62 "motd" 2> $RSLFILE
   BDONE="$(head -1 $RSLFILE)"
   if ! [ -z BDONE ]
   then
-    echo "M:$BDONE" >> $VHTFILE
+    echo "motdfile $BDONE" >> $VHTFILE
   fi
 fi
 
 dialog --title "Requires Identwd to be installed." --yesno "Do you want bnc's dynamic ident support?" 5 60
 ERRORLEVEL=$?
 if [ x$ERRORLEVEL = x0 ]
 then
-  echo "W:1" >> $VHTFILE
+  echo "useidentwd 1" >> $VHTFILE
 fi