- DALnet-src - nomad.dal.net

Bahamut 2.0.1 Released!
by Aaron Wiebe 16 Dec '11

16 Dec '11

Greetings All, Bahamut 2.0.1 has now been released - this resolves the known outstanding issues with 64 bit compatibility and IPv6. Below is a summary of the changes. Admins, feel free to roll out this update at your leisure. NOTE ON IPv6 SUPPORT: DALnet Admins are NOT PERMITTED to enable IPv6 listeners until the entire network has been upgraded and you've been given the go from SRA and Coders. Thanks. The new tarball can be retrieved at http://code.dal.net/release/ Sums as follows: md5: 4b5b26c6d9b711e4467b15a1a5310cd3 sha1: f57a58f0ed81ca5fcb09d4cbf57029b1f0a11f04 Changes for 2.0.1 ----------------- Kobi Shmueli (2): Fixed the m_topic() SIGSEGV bug I introduced on Bahamut 2.0.0. Added NO_LOCAL_CIDR_CHANNELBANS define. Ned T. Crigler (1): Fix compilation for FreeBSD 4 epiphani (2): Fix crash in sendto_all_servmask when using x64 architectures Remove legacy convert_conf tool

1 0

[PATCH] Fix compilation for FreeBSD 4
by Ned T. Crigler 05 Sep '11

05 Sep '11

Do a s/va_copy/VA_COPY/g in src/send.c so that our VA_COPY macro can be used to handle older systems that do not have va_copy. --- src/send.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/send.c b/src/send.c index c3ef84c..3d5ef7a 100644 --- a/src/send.c +++ b/src/send.c @@ -489,7 +489,7 @@ static inline int prefix_buffer(int remote, aClient *from, char *prefix, va_list vl2; /* copy of vl */ *buffer = ':'; - va_copy(vl2, vl); + VA_COPY(vl2, vl); if(!remote && IsPerson(from)) { @@ -1310,7 +1310,7 @@ void sendto_ops_lev(int lev, char *pattern, ...) if (!SendServNotice(cptr)) continue; } - va_copy(vl2, vl); + VA_COPY(vl2, vl); ircsprintf(nbuf, ":%s NOTICE %s :*** %s -- ", me.name, cptr->name, tmsg); strncat(nbuf, pattern, sizeof(nbuf) - strlen(nbuf)); @@ -1414,7 +1414,7 @@ void send_globops(char *pattern, ...) if (IsAnOper(cptr)) { - va_copy(vl2, vl); + VA_COPY(vl2, vl); ircsprintf(nbuf, ":%s NOTICE %s :*** Global -- %s", me.name, cptr->name, pattern); vsendto_one(cptr, nbuf, vl2); @@ -1441,7 +1441,7 @@ void send_chatops(char *pattern, ...) if (IsAnOper(cptr)) { - va_copy(vl2, vl); + VA_COPY(vl2, vl); ircsprintf(nbuf, ":%s NOTICE %s :*** ChatOps -- %s", me.name, cptr->name, pattern); vsendto_one(cptr, nbuf, vl2); @@ -1721,7 +1721,7 @@ void vsendto_realops(char *pattern, va_list vl) cptr = lp->value.cptr; if (IsAnOper(cptr)) { - va_copy(vl2, vl); + VA_COPY(vl2, vl); ircsprintf(nbuf, ":%s NOTICE %s :*** Notice -- %s", me.name, cptr->name, pattern); vsendto_one(cptr, nbuf, vl2); @@ -1846,7 +1846,7 @@ void sendto_realops_lev(int lev, char *pattern, ...) continue; break; } - va_copy(vl2, vl); + VA_COPY(vl2, vl); ircsnprintf(nbuf, 1024, ":%s NOTICE %s :*** %s -- %s", me.name, cptr->name, tmsg, pattern); vsendto_one(cptr, nbuf, vl2); @@ -1911,7 +1911,7 @@ void sendto_locops(char *pattern, ...) if (SendGlobops(cptr)) { - va_copy(vl2, vl); + VA_COPY(vl2, vl); ircsprintf(nbuf, ":%s NOTICE %s :*** LocOps -- %s", me.name, cptr->name, pattern); vsendto_one(cptr, nbuf, vl2); @@ -1937,7 +1937,7 @@ void sendto_gnotice(char *pattern, ...) cptr = lp->value.cptr; if (SendRnotice(cptr)) { - va_copy(vl2, vl); + VA_COPY(vl2, vl); ircsprintf(nbuf, ":%s NOTICE %s :*** Routing -- %s", me.name, cptr->name, pattern); vsendto_one(cptr, nbuf, vl2); -- 1.7.5.4

1 0

Bahamut 2.0 Released!
by Aaron Wiebe 04 Sep '11

04 Sep '11

Greetings All, One year and two days after the release of Bahamut 1.8.9, we've released Bahamut 2.0.0. This update contains full IPv6 support and cleans up issues with 64-bit builds, as well as a number of small changes. Below is the full change list, and I'd like to extend special thanks to Ned and Emilio for IPv6 and 64-bit fixes respectively. DALnet Admins: You are free to upgrade on your own timetables. However, this is essential: do NOT configure any v6 listeners until it has been cleared with the coding team and SRA. Until the entire network is upgraded, IPv6 support MUST not be used. The software is available at: http://code.dal.net/release/bahamut-2.0.0.tar.gz md5: 0bd76ca5335cbdb63a211eb46cebd895 sha1: 35dc9e64eda0c16509317056da357e86570f5e22 (Also at http://code.dal.net/release/bahamut-2.0.0-sums.txt) Thank you all! -Aaron ---- Bahamut 1.8.9 -> 2.0.0 ChangeLog --- Emilio Escobar (4): Fix SIGSEGV in vsprintf when compiled in 64-bit Added check for Linux to use /dev/urandom instead of /dev/random. BSD /dev/random does not block like it does on Linux. Fixed va_free statements and modified prefix_buffer to use copy of va_list to keep original defined. Added needed va_end Juan Baez (1): Fixed problem with initconf() where the function would not call fclose after it was done with the config file. Kobi Shmueli (2): Re-added SVSNOOP to let services temporary disable all o:lines on a given server. Support for nick!user@host topics, requires capab NICKIPSTR. Ned T. Crigler (24): Add NICKIPSTR capability. Move zero IP checking into clones_add/clones_remove. Add cipntoa, a function to return a client's IP address as a string. Introduce the possibility of multiple address families. Make clones.c support non-IPv4 addresses. Refactor the functions in s_auth.c in preparation for IPv6 client support. Refactor the functions in s_bsd.c in preparation for IPv6 client support. Allow IPv6 clients to connect to the server. Change the resolver to use a larger maximum hostname length. Use improved hashing algorithms in the resolver. Refactor the functions in res.c in preparation for IPv6 support. Make resolving IPv6 hostnames work for clients. Fix some problems found on FreeBSD 6.4 Fix relaying of NICKIPSTR NICK messages. Fix some issues when receiving a numeric IP address from a server. Reindent and cleanup lookup_confhost. Allow connections to and from IPv6 servers. Allow colons in klines. Add bitncmp and inet_parse_cidr. Add CIDR support to channel bans, O:lines and I:lines. Add IPv6 CIDR support to /who and /rwho. Add IPv6 CIDR support to klines. Silence some warnings found on FreeBSD 8.2 Fix various problems with non-standard build configurations. epiphani (6): Fix compatibility with gcc 2.95 in zlink header include order Update 005 numeric with +S channel mode Fix misspelled file name Allow Opers to view the state of +l and +k from outside the channel Don't allow banned users to change topics on -t channels. Update patchlevel. This is 2.0.0

1 0

[PATCH] Fix various problems with non-standard build configurations.
by Ned T. Crigler 31 Aug '11

31 Aug '11

From: "Ned T. Crigler" <crigler(a)gmail.com> Libraries should be prepended to $LIBS instead of appended, as the linker only does a single left-to-right pass over the command line. This sometimes showed up as link errors (such as when shared libraries are not being used) when -lssl came after -lcrypto, since -lssl depends on -lcrypto. Also, we were not actually using the include path for zlib detected by configure, as it was setting $CPPFLAGS, which wasn't being used in the Makefiles. --- configure.in | 26 +++++++++++++++----------- src/Makefile.in | 11 +++++------ tools/Makefile.in | 10 ++++++---- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/configure.in b/configure.in index 2ffb108..140eb97 100644 --- a/configure.in +++ b/configure.in @@ -394,7 +394,7 @@ if test "$check_hmodules" = "yes"; then AC_CHECK_FUNCS(dlopen dlsym, [set_hmodules="enabled"]) if test "$set_hmodules" = "enabled"; then AC_DEFINE(USE_HOOKMODULES) - MOD_LIBS="-Wl,-export-dynamic" + MOD_LDFLAGS="-Wl,-export-dynamic" fi fi @@ -440,7 +440,7 @@ if test "X$cf_enable_openssl" != "Xno" ; then if test "X$cf_openssl_basedir" != "X" ; then if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h" ; then SSL_INCLUDES="-I${cf_openssl_basedir}/include" - SSL_LIBS="-L${cf_openssl_basedir}/lib" + SSL_LDFLAGS="-L${cf_openssl_basedir}/lib" else dnl OpenSSL wasn't found in the directory specified. Naughty dnl administrator... @@ -460,7 +460,9 @@ if test "X$cf_enable_openssl" != "Xno" ; then dnl If we have a basedir defined, then everything is okay. Otherwise, dnl we have a problem. if test "X$cf_openssl_basedir" != "X" ; then - LIBS="$save_LIBS $SSL_LIBS -lcrypto" + CPPFLAGS="$CPPFLAGS $SSL_INCLUDES" + LDFLAGS="$LDFLAGS $SSL_LDFLAGS" + LIBS="-lssl -lcrypto $save_LIBS" AC_MSG_RESULT($cf_openssl_basedir) cf_enable_openssl="yes" encryption="enabled" @@ -613,7 +615,7 @@ fi if test "$solaris2" != "yes" && test "$aix" != "yes" && test "$set_hmodules" = "enabled"; then - LIBS="$LIBS $MOD_LIBS" + LDFLAGS="$LDFLAGS $MOD_LDFLAGS" fi if test "$check_maxconnections" = "auto"; then @@ -691,10 +693,14 @@ then fi if test -n "${ZLIB_HOME}" then - ZLIB_OLD_LDFLAGS=$LDFLAGS - ZLIB_OLD_CPPFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" - CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" + ZLIB_OLD_CPPFLAGS="$CPPFLAGS" + ZLIB_OLD_LDFLAGS="$LDFLAGS" + if test "x$ZLIB_HOME" = "x/usr"; then + : + else + CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" + LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" + fi AC_LANG_PUSH([C]) AC_CHECK_LIB(z, inflateEnd, [zlib_cv_libz=yes], [zlib_cv_libz=no]) AC_CHECK_HEADER(zlib.h, [zlib_cv_zlib_h=yes], [zlib_cv_zlib_h=no]) @@ -712,8 +718,8 @@ then # If either header or library was not found, revert and bomb # AC_MSG_CHECKING(zlib in ${ZLIB_HOME}) + CPPFLAGS="$ZLIB_OLD_CPPFLAGS" LDFLAGS="$ZLIB_OLD_LDFLAGS" - CPPFLAGS="$ZLIB_OLD_CPPFLAGS" AC_MSG_RESULT(failed) AC_MSG_ERROR(either specify a valid zlib installation with --with-zlib=DIR or disable zlib usage with --without-zlib) fi @@ -729,8 +735,6 @@ fi INSTALL_DIR="${prefix}" -AC_SUBST(SSL_INCLUDES) -AC_SUBST(SSL_LIBS) AC_SUBST(LIBS) AC_SUBST(SENGINE) AC_SUBST(INSTALL_DIR) diff --git a/src/Makefile.in b/src/Makefile.in index 5a63328..e0cb628 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,15 +1,15 @@ CC=@CC@ RM=@RM@ MV=@MV@ -IRCDLIBS=@LIBS@ -lssl -INCLUDEDIR=-I../include -OPENSSLINC=@SSL_INCLUDES@ +IRCDLIBS=@LIBS@ ENGINE=@SENGINE@ CRYPTO=@ENCRYPT_SRC@ INSTALL=@INSTALL@ INSTALL_BIN=@INSTALL_PROGRAM@ INSTALL_DIR=@INSTALL_DIR@ CFLAGS=@CFLAGS@ -fno-strict-aliasing +CPPFLAGS=@CPPFLAGS@ -I../include +LDFLAGS=@LDFLAGS@ RES_SRC = @@ -46,10 +46,10 @@ distclean: clean $(RM) -f Makefile version.c.last .c.o: - $(CC) $(CFLAGS) $(INCLUDEDIR) -c $< + $(CC) $(CPPFLAGS) $(CFLAGS) -c $< ircd: $(OBJECTS) - $(CC) ${LDFLAGS} -o ircd $(OBJECTS) $(IRCDLIBS) + $(CC) $(LDFLAGS) -o ircd $(OBJECTS) $(IRCDLIBS) mv version.c version.c.last install: @@ -347,7 +347,6 @@ dh.o: dh.c ../include/memcount.h ../include/struct.h ../include/config.h \ ../include/sbuf.h ../include/h.h ../include/send.h ../include/fdlist.h \ ../include/ircsprintf.h ../include/find.h ../include/blalloc.h \ ../include/throttle.h ../include/queue.h ../include/dh.h - $(CC) $(CFLAGS) $(OPENSSLINC) $(INCLUDEDIR) -c $< rc4.o: rc4.c ../include/memcount.h ../include/struct.h \ ../include/config.h ../include/setup.h ../include/defs.h \ ../include/sys.h ../include/hash.h ../include/sbuf.h ../include/h.h \ diff --git a/tools/Makefile.in b/tools/Makefile.in index 9756987..161ad23 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -7,7 +7,9 @@ IRCDLIBS=@LIBS@ INSTALL=@INSTALL@ INSTALL_BIN=@INSTALL_PROGRAM@ INSTALL_DIR=@INSTALL_DIR@ -INCLUDEDIR=-I../include +CFLAGS=@CFLAGS@ -fno-strict-aliasing +CPPFLAGS=@CPPFLAGS@ -I../include +LDFLAGS=@LDFLAGS@ mkpasswd_SOURCES = mkpasswd.c mkpasswd_OBJECTS = mkpasswd.o @@ -22,10 +24,10 @@ all: mkpasswd convert_conf build: all mkpasswd: $(mkpasswd_OBJECTS) - $(CC) -o mkpasswd $(mkpasswd_OBJECTS) $(IRCDLIBS) + $(CC) $(LDFLAGS) -o mkpasswd $(mkpasswd_OBJECTS) $(IRCDLIBS) convert_conf: $(convert_conf_OBJECTS) - $(CC) -o convert_conf $(convert_conf_OBJECTS) $(IRCDLIBS) + $(CC) $(LDFLAGS) -o convert_conf $(convert_conf_OBJECTS) $(IRCDLIBS) clean: $(RM) -f $(all_OBJECTS) mkpasswd convert_conf *~ core make-cert.sh @@ -34,7 +36,7 @@ distclean: clean $(RM) -f Makefile .c.o: - $(CC) $(CFLAGS) $(INCLUDEDIR) -c $< + $(CC) $(CPPFLAGS) $(CFLAGS) -c $< install: @for i in $(PROGRAMS); do \ -- 1.7.5.4

1 0

Channel Mode Suggestion
by Sukvinderjit singh 22 Jul '11

22 Jul '11

Hello Sir/Madam, As an old user on Dalnet i would like to suggest a mode that will work along with +j mode to stop flood effectively.As we all know +j controls the joins in a channel according to its setting. I would like to suggest another mode which would be called +Q or +q. What is +Q or +q ? Basically it will stops a user from speaking/noticing/action on the channel upon joining.Let me explain further : ie /mode channel +q:10 <-- a user cant chat/notice/action on the channel for 10 secs upon joining. This will stop the Message/notice/code Flood Such Like : [14:08] * Joins: cinrgt (~erzf(a)218.22.225.175) [14:08] -cinrgt:#india- #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA [14:08] * Joins: hprhou (~dxjz(a)218.22.225.175) [14:08] * Joins: pieynm (~znir(a)ool-182cce21.dyn.optonline.net) [14:08] -pieynm:#india- #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA #BESTOFINDIA As you can see from the above example +j is a great mode,it reduces mass join but it doesnt stops message flood upon joining.With the combination of +j and +q it will work wonders and i believe it will demotivate the flooders as they will be no much fun left in flooding. It was a great move to introduce +j, but +q will kill floods along with +j. With +q implemented floods like notice/message/action will be history. Summarize Mass join/joinpart/Notice/Code/Msg flood is the type of flood widely used on dalnet. +j addressed the mass join/join part issue but with the idea of +q we can address the remaining floods.This is a workable idea and if implemented, it would bring us another step closer to eliminate floods completely. My main nick on dalnet is |2|pac, if unclear about my idea plz memo/contact me on that nick. Thanks

1 0

umode modification suggestion
by Tony P. 10 Jul '11

10 Jul '11

One, I don't think there is a warning the person you're messaging isn't going to receive it like with +R. Two, change umode +C to accept messages from users who are on one's watchlist. I mean, the umode +C is to deal with spammers. But it can hurt legit messages, especially if one has friends who don't join the same channel one does.

1 0

Suggestion regarding expiring nick
by Faizan Ahmed 05 Jul '11

05 Jul '11

Dear Concern, I am a happy user of DALnet and quite satisfied with your services. I've been using DALNET since 2000 with my Nick Fair_Friend which recently dropped after 9/10 years registration. Because of which I was quite upset. Here I have a suggestion that if registered nick going to be dropped, User must notify through email regarding expiring nick before a week so that permenant users like me will must come back to avoid expiration of their nicks. Due to some busyness i could not identify my nick and when came back I shocked to see my nick's dropped. THAT REALLY MADE ME UNHAPPY. Hope my suggestion will pe entertained. Best regards Faizan Ahmed

1 0

[PATCH] Support for nick!user@host topics, requires capab NICKIPSTR.
by Kobi Shmueli 01 Jul '11

01 Jul '11

--- include/send.h | 1 + include/struct.h | 2 +- src/channel.c | 41 +++++++++++++++++++++++++++++++++-------- src/send.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 9 deletions(-) diff --git a/include/send.h b/include/send.h index a96adda..eab3766 100644 --- a/include/send.h +++ b/include/send.h @@ -75,6 +75,7 @@ extern void sendto_realops(char *pattern, ...) ATTRIBUTE_PRINTF(1, 2); extern void sendto_non_noquit_servs_butone(aClient *one, char *pattern, ...) ATTRIBUTE_PRINTF(2, 3); extern void sendto_serv_butone(aClient *one, char *pattern, ...) ATTRIBUTE_PRINTF(2, 3); extern void sendto_serv_butone_nickipstr(aClient *one, int flag, char *pattern, ...) ATTRIBUTE_PRINTF(3, 4); +extern void sendto_capab_serv_butone(aClient *one, int include, int exclude, char *pattern, ...) ATTRIBUTE_PRINTF(4, 5); extern void sendto_serv_butone_super(aClient *one, int flag, char *pattern, ...) ATTRIBUTE_PRINTF(3, 4); extern void sendto_wallops_butone(aClient *one, aClient *from, char *pattern, ...) ATTRIBUTE_PRINTF(3, 4); diff --git a/include/struct.h b/include/struct.h index ee705cb..b9c9c87 100644 --- a/include/struct.h +++ b/include/struct.h @@ -1212,7 +1212,7 @@ struct Channel Mode mode; char chname[CHANNELLEN+1]; char topic[TOPICLEN + 1]; - char topic_nick[NICKLEN + 1]; + char topic_nick[NICKLEN + 1 + USERLEN + 1 + HOSTLEN + 1]; time_t topic_time; int users; chanMember* members; diff --git a/src/channel.c b/src/channel.c index 40c14ae..c55ae2b 100644 --- a/src/channel.c +++ b/src/channel.c @@ -3329,14 +3329,32 @@ void send_topic_burst(aClient *cptr) { aChannel *chptr; aClient *acptr; + char *tmpptr; /* Temporary pointer to remove the user@host part from tnick for non-NICKIPSTR servers */ + char tnick[NICKLEN + 1]; /* chptr->topic_nick without the user@host part for non-NICKIPSTR servers */ + int len; /* tnick's length */ if (!(confopts & FLAGS_SERVHUB) || !(cptr->serv->uflags & ULF_NOBTOPIC)) for (chptr = channel; chptr; chptr = chptr->nextch) { if(chptr->topic[0] != '\0') - sendto_one(cptr, ":%s TOPIC %s %s %ld :%s", me.name, chptr->chname, - chptr->topic_nick, (long)chptr->topic_time, - chptr->topic); + { + if(cptr->capabilities & CAPAB_NICKIPSTR) + sendto_one(cptr, ":%s TOPIC %s %s %ld :%s", me.name, chptr->chname, + chptr->topic_nick, (long)chptr->topic_time, + chptr->topic); + else + { + /* This is a non-NICKIPSTR server, we need to remove the user@host part before we send it */ + tmpptr = chptr->topic_nick; + len = 0; + while(*tmpptr && *tmpptr!='!') + tnick[len++] = *(tmpptr++); + tnick[len] = '\0'; + sendto_one(cptr, ":%s TOPIC %s %s %ld :%s", me.name, chptr->chname, + tnick, (long)chptr->topic_time, + chptr->topic); + } + } } if (!(confopts & FLAGS_SERVHUB) || !(cptr->serv->uflags & ULF_NOBAWAY)) @@ -3357,7 +3375,8 @@ void send_topic_burst(aClient *cptr) int m_topic(aClient *cptr, aClient *sptr, int parc, char *parv[]) { aChannel *chptr = NullChn; - char *topic = NULL, *name, *tnick = sptr->name; + char *topic = NULL, *name, *tnick; + char *tmpptr; /* Temporary pointer to remove the user@host part from tnick for non-NICKIPSTR servers */ time_t ts = timeofday; int member; @@ -3427,6 +3446,7 @@ int m_topic(aClient *cptr, aClient *sptr, int parc, char *parv[]) chptr->chname); return 0; } + tnick = make_nick_user_host(sptr->name, sptr->user->username, sptr->user->host); } else { @@ -3437,6 +3457,7 @@ int m_topic(aClient *cptr, aClient *sptr, int parc, char *parv[]) tnick = parv[2]; ts = atoi(parv[3]); } + else tnick = sptr->name; /* ignore old topics during burst/race */ if (!IsULine(sptr) && chptr->topic[0] && chptr->topic_time >= ts) @@ -3451,10 +3472,14 @@ int m_topic(aClient *cptr, aClient *sptr, int parc, char *parv[]) * sends with the topic, so I changed everything to work like that. * -wd */ - sendto_serv_butone(cptr, ":%s TOPIC %s %s %lu :%s", parv[0], - chptr->chname, chptr->topic_nick, - (unsigned long)chptr->topic_time, - chptr->topic); + sendto_capab_serv_butone(cptr, CAPAB_NICKIPSTR, 0, ":%s TOPIC %s %s %lu :%s", parv[0], + chptr->chname, chptr->topic_nick, + (unsigned long)chptr->topic_time, chptr->topic); + if((tmpptr = strchr(tnick, '!'))) + *tmpptr = '\0'; /* Remove the user@host part before we send it to non-NICKIPSTR servers */ + sendto_capab_serv_butone(cptr, 0, CAPAB_NICKIPSTR, ":%s TOPIC %s %s %lu :%s", parv[0], + chptr->chname, chptr->topic_nick, + (unsigned long)chptr->topic_time, chptr->topic); sendto_channel_butserv_me(chptr, sptr, ":%s TOPIC %s :%s", parv[0], chptr->chname, chptr->topic); diff --git a/src/send.c b/src/send.c index 00fcab0..96fde71 100644 --- a/src/send.c +++ b/src/send.c @@ -792,6 +792,35 @@ void sendto_serv_butone_nickipstr(aClient *one, int flag, char *pattern, ...) return; } +/* sendto_capab_serv_butone - Send a message to all servers with "include" capab and without "exclude" capab */ +void sendto_capab_serv_butone(aClient *one, int include, int exclude, char *pattern, ...) +{ + aClient *cptr; + int k = 0; + fdlist send_fdlist; + va_list vl; + DLink *lp; + + va_start(vl, pattern); + for(lp = server_list; lp; lp = lp->next) + { + cptr = lp->value.cptr; + + if ((one==cptr) || + (include && !(cptr->capabilities & include)) || + (exclude && (cptr->capabilities & exclude))) + continue; + + send_fdlist.entry[++k] = cptr->fd; + } + send_fdlist.last_entry = k; + if (k) + vsendto_fdlist(&send_fdlist, pattern, vl); + va_end(vl); + + return; +} + /* * sendto_server_butone * -- 1.7.1.1

1 0

[PATCH 1/4] Added check for Linux to use /dev/urandom instead of /dev/random. BSD /dev/random does not block like it does on Linux.
by Emilio Escobar 01 Jul '11

01 Jul '11

--- src/dh.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/dh.c b/src/dh.c index 889c808..f588aeb 100644 --- a/src/dh.c +++ b/src/dh.c @@ -44,7 +44,11 @@ #ifdef __OpenBSD__ #define RAND_SRC "/dev/arandom" #else -#define RAND_SRC "/dev/random" +#ifdef __linux__ +#define RAND_SRC "/dev/urandom" +#else +#define RAND_SRC "/dev/urandom" +#endif #endif -- 1.7.2.5

1 3

[PATCH] Support for nick!user@host topics, requires capab NICKIPSTR.
by Kobi Shmueli 01 Jul '11

01 Jul '11

--- include/send.h | 1 + include/struct.h | 2 +- src/channel.c | 41 +++++++++++++++++++++++++++++++++-------- src/send.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 9 deletions(-) diff --git a/include/send.h b/include/send.h index a96adda..eab3766 100644 --- a/include/send.h +++ b/include/send.h @@ -75,6 +75,7 @@ extern void sendto_realops(char *pattern, ...) ATTRIBUTE_PRINTF(1, 2); extern void sendto_non_noquit_servs_butone(aClient *one, char *pattern, ...) ATTRIBUTE_PRINTF(2, 3); extern void sendto_serv_butone(aClient *one, char *pattern, ...) ATTRIBUTE_PRINTF(2, 3); extern void sendto_serv_butone_nickipstr(aClient *one, int flag, char *pattern, ...) ATTRIBUTE_PRINTF(3, 4); +extern void sendto_capab_serv_butone(aClient *one, int include, int exclude, char *pattern, ...) ATTRIBUTE_PRINTF(4, 5); extern void sendto_serv_butone_super(aClient *one, int flag, char *pattern, ...) ATTRIBUTE_PRINTF(3, 4); extern void sendto_wallops_butone(aClient *one, aClient *from, char *pattern, ...) ATTRIBUTE_PRINTF(3, 4); diff --git a/include/struct.h b/include/struct.h index ee705cb..b9c9c87 100644 --- a/include/struct.h +++ b/include/struct.h @@ -1212,7 +1212,7 @@ struct Channel Mode mode; char chname[CHANNELLEN+1]; char topic[TOPICLEN + 1]; - char topic_nick[NICKLEN + 1]; + char topic_nick[NICKLEN + 1 + USERLEN + 1 + HOSTLEN + 1]; time_t topic_time; int users; chanMember* members; diff --git a/src/channel.c b/src/channel.c index 40c14ae..c55ae2b 100644 --- a/src/channel.c +++ b/src/channel.c @@ -3329,14 +3329,32 @@ void send_topic_burst(aClient *cptr) { aChannel *chptr; aClient *acptr; + char *tmpptr; /* Temporary pointer to remove the user@host part from tnick for non-NICKIPSTR servers */ + char tnick[NICKLEN + 1]; /* chptr->topic_nick without the user@host part for non-NICKIPSTR servers */ + int len; /* tnick's length */ if (!(confopts & FLAGS_SERVHUB) || !(cptr->serv->uflags & ULF_NOBTOPIC)) for (chptr = channel; chptr; chptr = chptr->nextch) { if(chptr->topic[0] != '\0') - sendto_one(cptr, ":%s TOPIC %s %s %ld :%s", me.name, chptr->chname, - chptr->topic_nick, (long)chptr->topic_time, - chptr->topic); + { + if(cptr->capabilities & CAPAB_NICKIPSTR) + sendto_one(cptr, ":%s TOPIC %s %s %ld :%s", me.name, chptr->chname, + chptr->topic_nick, (long)chptr->topic_time, + chptr->topic); + else + { + /* This is a non-NICKIPSTR server, we need to remove the user@host part before we send it */ + tmpptr = chptr->topic_nick; + len = 0; + while(*tmpptr && *tmpptr!='!') + tnick[len++] = *(tmpptr++); + tnick[len] = '\0'; + sendto_one(cptr, ":%s TOPIC %s %s %ld :%s", me.name, chptr->chname, + tnick, (long)chptr->topic_time, + chptr->topic); + } + } } if (!(confopts & FLAGS_SERVHUB) || !(cptr->serv->uflags & ULF_NOBAWAY)) @@ -3357,7 +3375,8 @@ void send_topic_burst(aClient *cptr) int m_topic(aClient *cptr, aClient *sptr, int parc, char *parv[]) { aChannel *chptr = NullChn; - char *topic = NULL, *name, *tnick = sptr->name; + char *topic = NULL, *name, *tnick; + char *tmpptr; /* Temporary pointer to remove the user@host part from tnick for non-NICKIPSTR servers */ time_t ts = timeofday; int member; @@ -3427,6 +3446,7 @@ int m_topic(aClient *cptr, aClient *sptr, int parc, char *parv[]) chptr->chname); return 0; } + tnick = make_nick_user_host(sptr->name, sptr->user->username, sptr->user->host); } else { @@ -3437,6 +3457,7 @@ int m_topic(aClient *cptr, aClient *sptr, int parc, char *parv[]) tnick = parv[2]; ts = atoi(parv[3]); } + else tnick = sptr->name; /* ignore old topics during burst/race */ if (!IsULine(sptr) && chptr->topic[0] && chptr->topic_time >= ts) @@ -3451,10 +3472,14 @@ int m_topic(aClient *cptr, aClient *sptr, int parc, char *parv[]) * sends with the topic, so I changed everything to work like that. * -wd */ - sendto_serv_butone(cptr, ":%s TOPIC %s %s %lu :%s", parv[0], - chptr->chname, chptr->topic_nick, - (unsigned long)chptr->topic_time, - chptr->topic); + sendto_capab_serv_butone(cptr, CAPAB_NICKIPSTR, 0, ":%s TOPIC %s %s %lu :%s", parv[0], + chptr->chname, chptr->topic_nick, + (unsigned long)chptr->topic_time, chptr->topic); + if((tmpptr = strchr(tnick, '!'))) + *tmpptr = '\0'; /* Remove the user@host part before we send it to non-NICKIPSTR servers */ + sendto_capab_serv_butone(cptr, 0, CAPAB_NICKIPSTR, ":%s TOPIC %s %s %lu :%s", parv[0], + chptr->chname, chptr->topic_nick, + (unsigned long)chptr->topic_time, chptr->topic); sendto_channel_butserv_me(chptr, sptr, ":%s TOPIC %s :%s", parv[0], chptr->chname, chptr->topic); diff --git a/src/send.c b/src/send.c index 00fcab0..96fde71 100644 --- a/src/send.c +++ b/src/send.c @@ -792,6 +792,35 @@ void sendto_serv_butone_nickipstr(aClient *one, int flag, char *pattern, ...) return; } +/* sendto_capab_serv_butone - Send a message to all servers with "include" capab and without "exclude" capab */ +void sendto_capab_serv_butone(aClient *one, int include, int exclude, char *pattern, ...) +{ + aClient *cptr; + int k = 0; + fdlist send_fdlist; + va_list vl; + DLink *lp; + + va_start(vl, pattern); + for(lp = server_list; lp; lp = lp->next) + { + cptr = lp->value.cptr; + + if ((one==cptr) || + (include && !(cptr->capabilities & include)) || + (exclude && (cptr->capabilities & exclude))) + continue; + + send_fdlist.entry[++k] = cptr->fd; + } + send_fdlist.last_entry = k; + if (k) + vsendto_fdlist(&send_fdlist, pattern, vl); + va_end(vl); + + return; +} + /* * sendto_server_butone * -- 1.7.1.1

1 0