- ngIRCd GIT Updates - lists.barton.de

Florian Westphal : conn.c: fix resolver server address backlog
by fw＠arthur.barton.de 11 Sep '09

11 Sep '09

Module: ngircd.git Branch: master Commit: d76910ce7b9fad5679b7c614ed086e036560e37d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d76910ce… Author: Florian Westphal <fw(a)strlen.de> Date: Fri Sep 11 22:51:00 2009 +0200 conn.c: fix resolver server address backlog if more than one ip address is returned for a single host name, ngircd is supposed to try other addresses in case connect() to the first address returned fails for some reason. Alexander Barton noticed that this did not work at all, as the additional results were not stored. --- src/ngircd/conn.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index d6ad1e7..cd5921a 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1826,7 +1826,8 @@ cb_Connect_to_Server(int fd, UNUSED short events) size_t len; ng_ipaddr_t dest_addrs[4]; /* we can handle at most 3; but we read up to four so we can log the 'more than we can handle' - condition */ + condition. First result is tried immediately, rest + is saved for later if needed. */ LogDebug("Resolver: Got forward lookup callback on fd %d, events %d", fd, events); @@ -1851,13 +1852,13 @@ cb_Connect_to_Server(int fd, UNUSED short events) LogDebug("Got result from resolver: %u structs (%u bytes).", len/sizeof(ng_ipaddr_t), len); - memset(&Conf_Server[i].dst_addr, 0, sizeof(&Conf_Server[i].dst_addr)); + memset(&Conf_Server[i].dst_addr, 0, sizeof(Conf_Server[i].dst_addr)); if (len > sizeof(ng_ipaddr_t)) { /* more than one address for this hostname, remember them * in case first address is unreachable/not available */ len -= sizeof(ng_ipaddr_t); - if (len > sizeof(&Conf_Server[i].dst_addr)) { - len = sizeof(&Conf_Server[i].dst_addr); + if (len > sizeof(Conf_Server[i].dst_addr)) { + len = sizeof(Conf_Server[i].dst_addr); Log(LOG_NOTICE, "Notice: Resolver returned more IP Addresses for host than we can handle, additional addresses dropped."); }

1 0

Alexander Barton : Fix "implicit conversion shortens 64-bit value" warning
by alex＠arthur.barton.de 11 Sep '09

11 Sep '09

Module: ngircd.git Branch: master Commit: 8fd0e29d463c934756dce7a562f09ea831b5d968 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8fd0e29d… Author: Alexander Barton <alex(a)barton.de> Date: Fri Sep 11 22:52:12 2009 +0200 Fix "implicit conversion shortens 64-bit value" warning This patch fixes the following gcc warning in our sources: "implicit conversion shortens 64-bit value into a 32-bit value" --- src/ipaddr/ng_ipaddr.c | 3 ++- src/ipaddr/ng_ipaddr.h | 5 ++--- src/ngircd/channel.c | 2 +- src/ngircd/conf.c | 8 ++++---- src/ngircd/conn.c | 10 ++++++---- src/ngircd/conn.h | 5 +++-- src/ngircd/hash.c | 7 ++++--- src/ngircd/irc-info.c | 4 ++-- src/ngircd/resolve.c | 7 ++++--- src/tool/tool.c | 15 +++++++++------ 10 files changed, 37 insertions(+), 29 deletions(-) diff --git a/src/ipaddr/ng_ipaddr.c b/src/ipaddr/ng_ipaddr.c index b412cc8..0367a1f 100644 --- a/src/ipaddr/ng_ipaddr.c +++ b/src/ipaddr/ng_ipaddr.c @@ -151,7 +151,8 @@ ng_ipaddr_tostr_r(const ng_ipaddr_t *addr, char *str) if (*str == ':') { char tmp[NG_INET_ADDRSTRLEN] = "0"; ret = getnameinfo(sa, ng_ipaddr_salen(addr), - tmp+1, sizeof(tmp) -1, NULL, 0, NI_NUMERICHOST); + tmp + 1, (socklen_t)sizeof(tmp) - 1, + NULL, 0, NI_NUMERICHOST); if (ret == 0) strlcpy(str, tmp, NG_INET_ADDRSTRLEN); } diff --git a/src/ipaddr/ng_ipaddr.h b/src/ipaddr/ng_ipaddr.h index 6490a07..32b1ec0 100644 --- a/src/ipaddr/ng_ipaddr.h +++ b/src/ipaddr/ng_ipaddr.h @@ -58,10 +58,10 @@ ng_ipaddr_salen(const ng_ipaddr_t *a) #ifdef WANT_IPV6 assert(a->sa.sa_family == AF_INET || a->sa.sa_family == AF_INET6); if (a->sa.sa_family == AF_INET6) - return sizeof(a->sin6); + return (socklen_t)sizeof(a->sin6); #endif assert(a->sin4.sin_family == AF_INET); - return sizeof(a->sin4); + return (socklen_t)sizeof(a->sin4); } @@ -115,4 +115,3 @@ ng_ipaddr_tostr_r(const ng_ipaddr_t *addr, char *d) #endif /* -eof- */ - diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 6f85072..6e9e0f4 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -1085,7 +1085,7 @@ Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key) return false; } - while (fgets(line, sizeof(line), fd) != NULL) { + while (fgets(line, (int)sizeof(line), fd) != NULL) { ngt_TrimStr(line); if (! (nick = strchr(line, ':'))) continue; diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 1d1bb48..71f0fe8 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2009 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -152,8 +152,8 @@ ports_parse(array *a, int Line, char *Arg) * must be separated by "," */ ptr = strtok( Arg, "," ); while (ptr) { - ngt_TrimStr( ptr ); - port = atol( ptr ); + ngt_TrimStr(ptr); + port = atoi(ptr); if (port > 0 && port < 0xFFFF) { port16 = (UINT16) port; if (!array_catb(a, (char*)&port16, sizeof port16)) @@ -545,7 +545,7 @@ Set_Defaults( bool InitServers ) static bool no_listenports(void) { - unsigned int cnt = array_bytes(&Conf_ListenPorts); + size_t cnt = array_bytes(&Conf_ListenPorts); #ifdef SSL_SUPPORT cnt += array_bytes(&Conf_SSLOptions.ListenPorts); #endif diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 06d655b..d6ad1e7 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2007 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2009 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -155,7 +155,7 @@ cb_connserver(int sock, UNUSED short what) assert( what & IO_WANTWRITE); /* connect() finished, get result. */ - sock_len = sizeof( err ); + sock_len = (socklen_t)sizeof(err); res = getsockopt( My_Connections[idx].sock, SOL_SOCKET, SO_ERROR, &err, &sock_len ); assert( sock_len == sizeof( err )); @@ -485,7 +485,7 @@ set_v6_only(int af, int sock) if (af != AF_INET6) return; - if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on))) + if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &on, (socklen_t)sizeof(on))) Log(LOG_ERR, "Could not set IPV6_V6ONLY: %s", strerror(errno)); #else (void)af; @@ -1518,7 +1518,7 @@ Handle_Buffer(CONN_ID Idx) return 0; } - len_processed += len; + len_processed += (unsigned int)len; if (len <= delta) { /* Request is empty (only '\r\n', '\r' or '\n'); * delta is 2 ('\r\n') or 1 ('\r' or '\n'), see above */ @@ -2000,4 +2000,6 @@ Conn_UsesSSL(CONN_ID Idx) return Conn_OPTION_ISSET(&My_Connections[Idx], CONN_SSL); } #endif + + /* -eof- */ diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index 5e91402..983c884 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 by Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2009 by Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -41,7 +41,7 @@ #define CONN_SSL_WANT_READ 128 /* SSL/TLS library needs to read protocol data */ #define CONN_SSL_FLAGS_ALL (CONN_SSL_CONNECT|CONN_SSL|CONN_SSL_WANT_WRITE|CONN_SSL_WANT_READ) #endif -typedef int CONN_ID; +typedef long CONN_ID; #include "client.h" @@ -122,4 +122,5 @@ static inline bool Conn_UsesSSL(UNUSED CONN_ID Idx) { return false; } #endif #endif + /* -eof- */ diff --git a/src/ngircd/hash.c b/src/ngircd/hash.c index d9aa79b..1b2f4e6 100644 --- a/src/ngircd/hash.c +++ b/src/ngircd/hash.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2009 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,8 +37,9 @@ Hash( const char *String ) char buffer[LINE_LEN]; - strlcpy( buffer, String, sizeof( buffer )); - return jenkins_hash( (UINT8 *)ngt_LowerStr( buffer ), strlen( buffer ), 42 ); + strlcpy(buffer, String, sizeof(buffer)); + return jenkins_hash((UINT8 *)ngt_LowerStr(buffer), + (UINT32)strlen(buffer), 42); } /* Hash */ diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index f57a6a1..5a8555a 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2009 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -440,7 +440,7 @@ t_diff(time_t *t, const time_t d) remain = diff * d; *t -= remain; - return diff; + return (unsigned int)diff; } diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index e7f73ad..20077a4 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2003 by Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2009 by Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -218,7 +218,7 @@ ReverseLookup(const ng_ipaddr_t *IpAddr, char *resbuf, size_t reslen) *resbuf = 0; res = getnameinfo((struct sockaddr *) IpAddr, ng_ipaddr_salen(IpAddr), - resbuf, reslen, NULL, 0, NI_NAMEREQD); + resbuf, (socklen_t)reslen, NULL, 0, NI_NAMEREQD); if (res == 0) return true; @@ -540,5 +540,6 @@ Resolve_Read( RES_STAT *s, void* readbuf, size_t buflen) Resolve_Shutdown(s); return (size_t)bytes_read; } -/* -eof- */ + +/* -eof- */ diff --git a/src/tool/tool.c b/src/tool/tool.c index a24c160..c973539 100644 --- a/src/tool/tool.c +++ b/src/tool/tool.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2009 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -107,16 +107,19 @@ ngt_TrimLastChr( char *String, const char Chr) /* If last character in the string matches Chr, remove it. * Empty strings are handled correctly. */ - unsigned int len; + size_t len; - assert( String != NULL ); + assert(String != NULL); - len = strlen( String ); - if( len == 0 ) return; + len = strlen(String); + if(len == 0) + return; len--; - if( String[len] == Chr ) String[len] = '\0'; + if(String[len] == Chr) + String[len] = '\0'; } /* ngt_TrimLastChr */ + /* -eof- */

1 0

Alexander Barton : Mac OS X: fix test for packagemaker(1) tool in Makefile
by alex＠arthur.barton.de 11 Sep '09

11 Sep '09

Module: ngircd.git Branch: master Commit: 44acf41cc172e8131c3a987d430b9f948afd26ad URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=44acf41c… Author: Alexander Barton <alex(a)barton.de> Date: Thu Sep 10 11:48:14 2009 +0200 Mac OS X: fix test for packagemaker(1) tool in Makefile --- Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0fd0622..bea1cfc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,7 +56,7 @@ deb: dpkg-buildpackage -rfakeroot -i osxpkg: have-xcodebuild - @packagemaker >/dev/null 2>&1; [ $$? -ge 1 ] \ + @packagemaker >/dev/null 2>&1; [ $$? -le 1 ] \ || ( echo; echo "Error: \"packagemaker\" not found!"; echo; exit 2) make clean ./configure --prefix=/opt/ngircd

1 0

Alexander Barton : Conn_Close(): remove unused variable "txt"
by alex＠arthur.barton.de 11 Sep '09

11 Sep '09

Module: ngircd.git Branch: master Commit: e1598e2670d599441f63c01f8df2ee5158ead2d4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e1598e26… Author: Alexander Barton <alex(a)barton.de> Date: Thu Sep 10 11:49:39 2009 +0200 Conn_Close(): remove unused variable "txt" --- src/ngircd/conn.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index d62be35..06d655b 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -900,7 +900,6 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie * sub-processes are closed down. */ CLIENT *c; - const char *txt; double in_k, out_k; UINT16 port; #ifdef ZLIB @@ -923,13 +922,6 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie /* Mark link as "closing" */ Conn_OPTION_ADD( &My_Connections[Idx], CONN_ISCLOSING ); - if (LogMsg) - txt = LogMsg; - else - txt = FwdMsg; - if (! txt) - txt = "Reason unknown"; - port = ng_ipaddr_getport(&My_Connections[Idx].addr); Log(LOG_INFO, "Shutting down connection %d (%s) with %s:%d ...", Idx, LogMsg ? LogMsg : FwdMsg, My_Connections[Idx].host, port);

1 0

Alexander Barton : IRC_PASS(): remove unnecessary variable initialization
by alex＠arthur.barton.de 11 Sep '09

11 Sep '09

Module: ngircd.git Branch: master Commit: c191ea53a9600467c9b36baa6b930e2fa1a5796f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c191ea53… Author: Alexander Barton <alex(a)barton.de> Date: Thu Sep 10 11:50:43 2009 +0200 IRC_PASS(): remove unnecessary variable initialization --- src/ngircd/irc-login.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 16d1641..7b73d40 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -148,7 +148,6 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) } else { /* The peer seems to be a server supporting the * "original" IRC protocol (RFC 2813). */ - serverver = ""; if (strchr(orig_flags, 'Z')) flags = "Z"; else

1 0

Alexander Barton : IRC_SERVER(): code cleanup, remove unneeded variable
by alex＠arthur.barton.de 11 Sep '09

11 Sep '09

Module: ngircd.git Branch: master Commit: 3b37ad334b6a7fbc5ca907e1af72efd3d3f8bd3b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3b37ad33… Author: Alexander Barton <alex(a)barton.de> Date: Fri Sep 11 00:41:12 2009 +0200 IRC_SERVER(): code cleanup, remove unneeded variable --- src/ngircd/irc-server.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index 7236d9a..3c34c20 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -51,7 +51,6 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) { char str[LINE_LEN]; CLIENT *from, *c; - bool ok; int i; CONN_ID con; @@ -97,25 +96,25 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) /* Is this server registering on our side, or are we connecting to * a remote server? */ - con = Client_Conn( Client ); - if( Client_Token( Client ) != TOKEN_OUTBOUND ) - { + con = Client_Conn(Client); + if (Client_Token(Client) != TOKEN_OUTBOUND) { /* Incoming connection, send user/pass */ - ok = true; - if( ! IRC_WriteStrClient( Client, "PASS %s %s", Conf_Server[i].pwd_out, NGIRCd_ProtoID )) ok = false; - else ok = IRC_WriteStrClient( Client, "SERVER %s 1 :%s", Conf_ServerName, Conf_ServerInfo ); - if( ! ok ) - { - Conn_Close( con, "Unexpected server behavior!", NULL, false ); - return DISCONNECTED; + if (!IRC_WriteStrClient(Client, "PASS %s %s", + Conf_Server[i].pwd_out, + NGIRCd_ProtoID) + || !IRC_WriteStrClient(Client, "SERVER %s 1 :%s", + Conf_ServerName, + Conf_ServerInfo)) { + Conn_Close(con, "Unexpected server behavior!", + NULL, false); + return DISCONNECTED; } - Client_SetIntroducer( Client, Client ); - Client_SetToken( Client, 1 ); - } - else - { - /* outgoing connect, we already sent SERVER and PASS to the peer */ - Client_SetToken( Client, atoi( Req->argv[1] )); + Client_SetIntroducer(Client, Client); + Client_SetToken(Client, 1); + } else { + /* outgoing connect, we already sent a SERVER and PASS + * command to the peer */ + Client_SetToken(Client, atoi(Req->argv[1])); } /* Mark this connection as belonging to an configured server */

1 0

Alexander Barton : Channel_Mode(): fix return code of function
by alex＠arthur.barton.de 11 Sep '09

11 Sep '09

Module: ngircd.git Branch: master Commit: 66c6458ae7aa575c0a7a8250476472d59a155e28 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=66c6458a… Author: Alexander Barton <alex(a)barton.de> Date: Fri Sep 11 00:44:41 2009 +0200 Channel_Mode(): fix return code of function Fix error handling of Channel_Mode() to return the correct connection status ("connected"/"disconnected") insted of always returning success. --- src/ngircd/irc-mode.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 8e08565..9509fb0 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -284,7 +284,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) { char the_modes[COMMAND_LEN], the_args[COMMAND_LEN], x[2], argadd[CLIENT_PASS_LEN], *mode_ptr; - bool ok, set, modeok = true, skiponce, use_servermode = false, retval; + bool connected, set, modeok = true, skiponce, use_servermode = false, retval; int mode_arg, arg_arg; CLIENT *client; long l; @@ -344,7 +344,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) the_args[0] = '\0'; x[1] = '\0'; - ok = CONNECTED; + connected = CONNECTED; while (mode_ptr) { if (!skiponce) mode_ptr++; @@ -404,7 +404,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) if (modeok) x[0] = *mode_ptr; else - ok = IRC_WriteStrClient(Origin, + connected = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(Origin), Channel_Name(Channel)); break; @@ -413,7 +413,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) if (modeok) x[0] = *mode_ptr; else - ok = IRC_WriteStrClient(Origin, + connected = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(Origin), Channel_Name(Channel)); @@ -428,7 +428,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) sizeof(argadd)); x[0] = *mode_ptr; } else { - ok = IRC_WriteStrClient(Origin, + connected = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(Origin), Channel_Name(Channel)); @@ -436,7 +436,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) Req->argv[arg_arg][0] = '\0'; arg_arg++; } else { - ok = IRC_WriteStrClient(Origin, + connected = IRC_WriteStrClient(Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID(Origin), Req->command); goto chan_exit; @@ -447,7 +447,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) if (modeok) x[0] = *mode_ptr; else - ok = IRC_WriteStrClient(Origin, + connected = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(Origin), Channel_Name(Channel)); @@ -464,7 +464,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) x[0] = *mode_ptr; } } else { - ok = IRC_WriteStrClient(Origin, + connected = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(Origin), Channel_Name(Channel)); @@ -472,7 +472,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) Req->argv[arg_arg][0] = '\0'; arg_arg++; } else { - ok = IRC_WriteStrClient(Origin, + connected = IRC_WriteStrClient(Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID(Origin), Req->command); goto chan_exit; @@ -484,13 +484,13 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) * set the 'P' channel mode! */ if (set && !(Client_OperByMe(Client) || Client_Type(Client) == CLIENT_SERVER)) - ok = IRC_WriteStrClient(Origin, + connected = IRC_WriteStrClient(Origin, ERR_NOPRIVILEGES_MSG, Client_ID(Origin)); else x[0] = 'P'; } else - ok = IRC_WriteStrClient(Origin, + connected = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(Origin), Channel_Name(Channel)); @@ -504,12 +504,12 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) if (client) x[0] = *mode_ptr; else - ok = IRC_WriteStrClient(Client, + connected = IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID(Client), Req->argv[arg_arg]); } else { - ok = IRC_WriteStrClient(Origin, + connected = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(Origin), Channel_Name(Channel)); @@ -517,7 +517,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) Req->argv[arg_arg][0] = '\0'; arg_arg++; } else { - ok = IRC_WriteStrClient(Origin, + connected = IRC_WriteStrClient(Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID(Origin), Req->command); goto chan_exit; @@ -529,7 +529,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) if (arg_arg > mode_arg) { /* modify list */ if (modeok) { - ok = set + connected = set ? Add_Ban_Invite(*mode_ptr, Origin, Client, Channel, Req->argv[arg_arg]) @@ -537,7 +537,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) Client, Channel, Req->argv[arg_arg]); } else { - ok = IRC_WriteStrClient(Origin, + connected = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(Origin), Channel_Name(Channel)); @@ -557,7 +557,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) set ? '+' : '-', *mode_ptr, Client_ID(Origin), Channel_Name(Channel)); if (Client_Type(Client) != CLIENT_SERVER) - ok = IRC_WriteStrClient(Origin, + connected = IRC_WriteStrClient(Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID(Origin), set ? '+' : '-', *mode_ptr); @@ -565,7 +565,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) goto chan_exit; } /* switch() */ - if (!ok) + if (!connected) break; /* Is there a valid mode change? */ @@ -646,7 +646,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) if (use_servermode) Origin = Client_ThisServer(); /* Send reply to client and inform other servers and channel users */ - ok = IRC_WriteStrClientPrefix(Client, Origin, + connected = IRC_WriteStrClientPrefix(Client, Origin, "MODE %s %s%s", Channel_Name(Channel), the_modes, the_args); /* Only forward requests for non-local channels */ @@ -661,7 +661,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) } IRC_SetPenalty(Client, 1); - return CONNECTED; + return connected; } /* Channel_Mode */

1 0

Alexander Barton : Xcode: use gcc 4.0 for Mac OS X 10.4 compatibility
by alex＠arthur.barton.de 11 Sep '09

11 Sep '09

Module: ngircd.git Branch: master Commit: bfa48f3448a140048386810f97049ad8200c1842 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bfa48f34… Author: Alexander Barton <alex(a)barton.de> Date: Fri Sep 11 20:19:51 2009 +0200 Xcode: use gcc 4.0 for Mac OS X 10.4 compatibility --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index 2d65649..f74b9e5 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -712,10 +712,9 @@ 1DEB928B08733DD80010E9CD /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); + ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; + GCC_VERSION = 4.0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO;

1 0

Alexander Barton : Fix --with-{openssl|gnutls} to accept path names
by alex＠arthur.barton.de 02 Sep '09

02 Sep '09

Module: ngircd.git Branch: master Commit: 933da741c6485e090990f296ad89e6173583829b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=933da741… Author: Alexander Barton <alex(a)barton.de> Date: Wed Sep 2 14:28:09 2009 +0200 Fix --with-{openssl|gnutls} to accept path names This patch fixes --with-openssl and --with-gnutls and enables both to accept path names, so that you can use "./configure --with-XXX=/path". All the other --with-XXX parameters support this already. --- configure.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index d10f6ec..1940834 100644 --- a/configure.in +++ b/configure.in @@ -315,7 +315,7 @@ fi AC_ARG_WITH(openssl, [ --with-openssl enable SSL support using OpenSSL], - [ if test "$withval" = "yes"; then + [ if test "$withval" != "no"; then if test "$withval" != "yes"; then CFLAGS="-I$withval/include $CFLAGS" CPPFLAGS="-I$withval/include $CPPFLAGS" @@ -332,7 +332,7 @@ AC_ARG_WITH(openssl, AC_ARG_WITH(gnutls, [ --with-gnutls enable SSL support using gnutls], - [ if test "$withval" = "yes"; then + [ if test "$withval" != "no"; then if test "$withval" != "yes"; then CFLAGS="-I$withval/include $CFLAGS" CPPFLAGS="-I$withval/include $CPPFLAGS"

1 0

Florian Westphal : do not add default listening port if ssl ports were specified
by fw＠arthur.barton.de 31 Aug '09

31 Aug '09

Module: ngircd.git Branch: master Commit: cf7e19193b79af0711c5a03ac7da33bd84947b16 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cf7e1919… Author: Florian Westphal <fw(a)strlen.de> Date: Mon Aug 31 19:42:59 2009 +0200 do not add default listening port if ssl ports were specified Cosmo Kastemaa reported that its impossible to create an ssl-only setup, as ngircd binds to port 6667 by default, even if setting "Ports =". Only add the default port if _both_ "Ports" and "SSLPorts" are unspecified. Fixes bugzilla #98. --- man/ngircd.conf.5.tmpl | 3 ++- src/ngircd/conf.c | 24 ++++++++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 8e5b254..a725af6 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -75,7 +75,8 @@ command. .TP \fBPorts\fR Ports on which the server should listen. There may be more than one port, -separated with commas (","). Default: 6667. +separated with commas (","). Default: 6667, unless \fBSSL_Ports\fR are also +specified. .TP \fBSSLPorts\fR Same as \fBPorts\fR , except that ngIRCd will expect incoming connections diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index eccf13c..1d1bb48 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -543,6 +543,16 @@ Set_Defaults( bool InitServers ) static bool +no_listenports(void) +{ + unsigned int cnt = array_bytes(&Conf_ListenPorts); +#ifdef SSL_SUPPORT + cnt += array_bytes(&Conf_SSLOptions.ListenPorts); +#endif + return cnt == 0; +} + +static bool Read_Config( bool ngircd_starting ) { /* Read configuration file. */ @@ -698,12 +708,14 @@ Read_Config( bool ngircd_starting ) Conf_Server[New_Server_Idx] = New_Server; } - if (0 == array_length(&Conf_ListenPorts, sizeof(UINT16))) { - if (!array_copyb(&Conf_ListenPorts, (char*) &defaultport, sizeof defaultport)) { - Config_Error( LOG_ALERT, "Could not add default listening Port %u: %s", - (unsigned int) defaultport, strerror(errno)); - exit( 1 ); - } + /* not a single listening port? Add default. */ + if (no_listenports() && + !array_copyb(&Conf_ListenPorts, (char*) &defaultport, sizeof defaultport)) + { + Config_Error(LOG_ALERT, "Could not add default listening Port %u: %s", + (unsigned int) defaultport, strerror(errno)); + + exit(1); } if (!Conf_ListenAddress)

1 0