- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Introduce Free_Client() function to free CLIENT structure
by alex＠arthur.barton.de 26 Aug '13

26 Aug '13

Module: ngircd.git Branch: master Commit: 0ff33777febca1ac06417c976a4a3e76b68c93d8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0ff33777… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 26 22:55:00 2013 +0200 Introduce Free_Client() function to free CLIENT structure --- src/ngircd/client.c | 51 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 26d4929..2835b46 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -62,6 +62,8 @@ static CLIENT *New_Client_Struct PARAMS(( void )); static void Generate_MyToken PARAMS(( CLIENT *Client )); static void Adjust_Counters PARAMS(( CLIENT *Client )); +static void Free_Client PARAMS(( CLIENT **Client )); + static CLIENT *Init_New_Client PARAMS((CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, int Type, const char *ID, const char *User, const char *Hostname, const char *Info, @@ -120,20 +122,15 @@ Client_Exit( void ) cnt = 0; c = My_Clients; - while( c ) - { + while(c) { cnt++; next = (CLIENT *)c->next; - if (c->account_name) - free(c->account_name); - if (c->cloaked) - free(c->cloaked); - if (c->ipa_text) - free(c->ipa_text); - free( c ); + Free_Client(&c); c = next; } - if( cnt ) Log( LOG_INFO, "Freed %d client structure%s.", cnt, cnt == 1 ? "" : "s" ); + if (cnt) + Log(LOG_INFO, "Freed %d client structure%s.", + cnt, cnt == 1 ? "" : "s"); } /* Client_Exit */ @@ -324,13 +321,7 @@ Client_Destroy( CLIENT *Client, const char *LogMsg, const char *FwdMsg, bool Sen } } - if (c->account_name) - free(c->account_name); - if (c->cloaked) - free(c->cloaked); - if (c->ipa_text) - free(c->ipa_text); - free( c ); + Free_Client(&c); break; } last = c; @@ -1410,6 +1401,11 @@ MyCount( CLIENT_TYPE Type ) } /* MyCount */ +/** + * Allocate and initialize new CLIENT strcuture. + * + * @return Pointer to CLIENT structure or NULL on error. + */ static CLIENT * New_Client_Struct( void ) { @@ -1432,8 +1428,27 @@ New_Client_Struct( void ) c->mytoken = -1; return c; -} /* New_Client */ +} +/** + * Free a CLIENT structure and its member variables. + */ +static void +Free_Client(CLIENT **Client) +{ + assert(Client != NULL); + assert(*Client != NULL); + + if ((*Client)->account_name) + free((*Client)->account_name); + if ((*Client)->cloaked) + free((*Client)->cloaked); + if ((*Client)->ipa_text) + free((*Client)->ipa_text); + + free(*Client); + *Client = NULL; +} static void Generate_MyToken( CLIENT *Client )

1 0

Alexander Barton : Save client IP address text for "WebIRC" users
by alex＠arthur.barton.de 26 Aug '13

26 Aug '13

Module: ngircd.git Branch: master Commit: 1dc93286a0d5b80259604b4f25021fcc5a730b5b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1dc93286… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 26 22:54:00 2013 +0200 Save client IP address text for "WebIRC" users This patch introduces a new field in the CLIENT structure, "ipa_text", which points to an optional textual representation of the client IP address (or NULL) which can be used to store the "real" IP address information of a client using the "WEBIRC" protocol. Without this patch, ngIRCd ignored the <ip-address> paramater ... In addition, the functions Client_SetIPAText() and Client_IPAText() have been introduced to set and get the textual representation of the client IP address. Client_IPAText() can be used even when no "IP address text" has been set before, it then returns the real IP address of the connection. Closes bug #159. --- src/ngircd/client.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/ngircd/client.h | 5 ++++- src/ngircd/irc-info.c | 4 ++-- src/ngircd/irc-login.c | 2 ++ 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 72774ca..26d4929 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -128,6 +128,8 @@ Client_Exit( void ) free(c->account_name); if (c->cloaked) free(c->cloaked); + if (c->ipa_text) + free(c->ipa_text); free( c ); c = next; } @@ -326,6 +328,8 @@ Client_Destroy( CLIENT *Client, const char *LogMsg, const char *FwdMsg, bool Sen free(c->account_name); if (c->cloaked) free(c->cloaked); + if (c->ipa_text) + free(c->ipa_text); free( c ); break; } @@ -368,6 +372,27 @@ Client_SetHostname( CLIENT *Client, const char *Hostname ) } /* Client_SetHostname */ +/** + * Set IP address to display for a client. + * + * @param Client The client. + * @param IPAText Textual representation of the IP address or NULL to unset. + */ +GLOBAL void +Client_SetIPAText(CLIENT *Client, const char *IPAText) +{ + assert(Client != NULL); + + if (Client->ipa_text) + free(Client->ipa_text); + + if (*IPAText) + Client->ipa_text = strndup(IPAText, CLIENT_HOST_LEN - 1); + else + Client->ipa_text = NULL; +} + + GLOBAL void Client_SetID( CLIENT *Client, const char *ID ) { @@ -789,6 +814,21 @@ Client_HostnameDisplayed(CLIENT *Client) return Client->cloaked; } +GLOBAL const char * +Client_IPAText(CLIENT *Client) +{ + assert(Client != NULL); + + /* Not a local client? */ + if (Client_Conn(Client) <= NONE) + return "0.0.0.0"; + + if (!Client->ipa_text) + return Conn_GetIPAInfo(Client_Conn(Client)); + else + return Client->ipa_text; +} + /** * Update (and generate, if necessary) the cloaked hostname of a client. * diff --git a/src/ngircd/client.h b/src/ngircd/client.h index 702f114..71d413b 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2013 Alexander Barton (alex(a)barton.de) and Contributors. * * 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 @@ -49,6 +49,7 @@ typedef struct _CLIENT struct _CLIENT *topserver; /* toplevel servers (only valid if client is a server) */ char host[CLIENT_HOST_LEN]; /* hostname of the client */ char *cloaked; /* cloaked hostname of the client */ + char *ipa_text; /* textual representaton of IP address */ char user[CLIENT_USER_LEN]; /* user name ("login") */ #if defined(PAM) && defined(IDENTAUTH) char orig_user[CLIENT_USER_LEN];/* user name supplied by USER command */ @@ -114,6 +115,7 @@ GLOBAL char *Client_OrigUser PARAMS(( CLIENT *Client )); GLOBAL char *Client_Hostname PARAMS(( CLIENT *Client )); GLOBAL char *Client_HostnameCloaked PARAMS((CLIENT *Client)); GLOBAL char *Client_HostnameDisplayed PARAMS(( CLIENT *Client )); +GLOBAL const char *Client_IPAText PARAMS(( CLIENT *Client )); GLOBAL char *Client_Modes PARAMS(( CLIENT *Client )); GLOBAL char *Client_Flags PARAMS(( CLIENT *Client )); GLOBAL CLIENT *Client_Introducer PARAMS(( CLIENT *Client )); @@ -131,6 +133,7 @@ GLOBAL bool Client_HasMode PARAMS(( CLIENT *Client, char Mode )); GLOBAL bool Client_HasFlag PARAMS(( CLIENT *Client, char Flag )); GLOBAL void Client_SetHostname PARAMS(( CLIENT *Client, const char *Hostname )); +GLOBAL void Client_SetIPAText PARAMS(( CLIENT *Client, const char *IPAText )); GLOBAL void Client_SetID PARAMS(( CLIENT *Client, const char *Nick )); GLOBAL void Client_SetUser PARAMS(( CLIENT *Client, const char *User, bool Idented )); GLOBAL void Client_SetOrigUser PARAMS(( CLIENT *Client, const char *User )); diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 47a3797..3d77237 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -407,8 +407,8 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) (from == c || (!Conf_MorePrivacy && Client_HasMode(from, 'o')))) { /* Client hostname */ if (!IRC_WriteStrClient(from, RPL_WHOISHOST_MSG, - Client_ID(from), Client_ID(c), Client_Hostname(c), - Conn_GetIPAInfo(Client_Conn(c)))) + Client_ID(from), Client_ID(c), + Client_Hostname(c), Client_IPAText(c))) return DISCONNECTED; /* Client modes */ if (!IRC_WriteStrClient(from, RPL_WHOISMODES_MSG, diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 26dae6b..88804ef 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -610,6 +610,8 @@ IRC_WEBIRC(CLIENT *Client, REQUEST *Req) Client_SetUser(Client, Req->argv[1], true); Client_SetOrigUser(Client, Req->argv[1]); Client_SetHostname(Client, Req->argv[2]); + Client_SetIPAText(Client, Req->argv[3]); + return CONNECTED; } /* IRC_WEBIRC */

1 0

Alexander Barton : Implement new configuration option "DefaultUserModes"
by alex＠arthur.barton.de 26 Aug '13

26 Aug '13

Module: ngircd.git Branch: master Commit: 2bacb8210b4f0807eb50587bcc4329c7ea7a50c3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2bacb821… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 26 21:17:10 2013 +0200 Implement new configuration option "DefaultUserModes" The new configuration option "DefaultUserModes" lists user modes that become automatically set on new local clients right after login. Please note that only modes can be set that the client could set on itself, you can't set "a" (away) or "o" (IRC Op), for example! User modes "i" (invisible) or "x" (cloaked) etc. are "interesting", though. Default: set no modes (like without this patch). Closes bug #160. --- doc/sample-ngircd.conf.tmpl | 7 ++++++- man/ngircd.conf.5.tmpl | 6 ++++++ src/ngircd/conf.c | 26 ++++++++++++++++++++++++++ src/ngircd/conf.h | 3 +++ src/ngircd/login.c | 18 ++++++++++++++++-- 5 files changed, 57 insertions(+), 3 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 99960e9..ae1b213 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -165,7 +165,12 @@ ;ConnectIPv6 = yes ;ConnectIPv4 = yes - # Do any DNS lookups when a client connects to the server. + # Default user mode(s) to set on new local clients. Please note that + # only modes can be set that the client could set on itself, you can't + # set "a" (away) or "o" (IRC Op), for example! Default: none. + ;DefaultUserModes = i + + # Do DNS lookups when a client connects to the server. ;DNS = yes # Do IDENT lookups if ngIRCd has been compiled with support for it. diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index c9d7bf8..cf926f9 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -258,6 +258,12 @@ Set this to no if you do not want ngIRCd to connect to other IRC servers using the IPv6 protocol. Default: yes. .TP +\fBDefaultUserModes\fR (string) +Default user mode(s) to set on new local clients. Please note that only modes +can be set that the client could set on itself, you can't set "a" (away) or +"o" (IRC Op), for example! +Default: none. +.TP \fBDNS\fR (boolean) If set to false, ngIRCd will not make any DNS lookups when clients connect. If you configure the daemon to connect to other servers, ngIRCd may still diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 79376b8..b10f490 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -402,6 +402,7 @@ Conf_Test( void ) printf(" ConnectIPv4 = %s\n", yesno_to_str(Conf_ConnectIPv6)); printf(" ConnectIPv6 = %s\n", yesno_to_str(Conf_ConnectIPv4)); #endif + printf(" DefaultUserModes = %s\n", Conf_DefaultUserModes); printf(" DNS = %s\n", yesno_to_str(Conf_DNS)); #ifdef IDENT printf(" Ident = %s\n", yesno_to_str(Conf_Ident)); @@ -776,6 +777,7 @@ Set_Defaults(bool InitServers) #else Conf_ConnectIPv6 = false; #endif + strcpy(Conf_DefaultUserModes, ""); Conf_DNS = true; #ifdef IDENTAUTH Conf_Ident = true; @@ -1706,6 +1708,30 @@ Handle_OPTIONS(const char *File, int Line, char *Var, char *Arg) Conf_ConnectIPv4 = Check_ArgIsTrue(Arg); return; } + if (strcasecmp(Var, "DefaultUserModes") == 0) { + p = Arg; + Conf_DefaultUserModes[0] = '\0'; + while (*p) { + if (strchr(Conf_DefaultUserModes, *p)) { + /* Mode is already included; ignore it */ + p++; + continue; + } + + if (strchr(USERMODES, *p)) { + len = strlen(Conf_DefaultUserModes) + 1; + assert(len < sizeof(Conf_DefaultUserModes)); + Conf_DefaultUserModes[len - 1] = *p; + Conf_DefaultUserModes[len] = '\0'; + } else { + Config_Error(LOG_WARNING, + "%s, line %d: Unknown user mode \"%c\" in \"DefaultUserModes\"!", + File, Line, *p); + } + p++; + } + return; + } if (strcasecmp(Var, "DNS") == 0) { Conf_DNS = Check_ArgIsTrue(Arg); return; diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 93d6785..948749d 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -202,6 +202,9 @@ GLOBAL bool Conf_PAMIsOptional; /** Disable all CTCP commands except for /me ? */ GLOBAL bool Conf_ScrubCTCP; +/** Default user modes for new local clients */ +GLOBAL char Conf_DefaultUserModes[CLIENT_MODE_LEN]; + /* * try to connect to remote systems using the ipv6 protocol, * if they have an ipv6 address? (default yes) diff --git a/src/ngircd/login.c b/src/ngircd/login.c index bbde635..4011b8b 100644 --- a/src/ngircd/login.c +++ b/src/ngircd/login.c @@ -19,6 +19,7 @@ #include "imp.h" #include <assert.h> #include <stdlib.h> +#include <stdio.h> #include <string.h> #include <strings.h> #include <unistd.h> @@ -37,6 +38,7 @@ #include "ngircd.h" #include "pam.h" #include "irc-info.h" +#include "irc-mode.h" #include "irc-write.h" #include "exp.h" @@ -151,6 +153,9 @@ Login_User(CLIENT * Client) GLOBAL bool Login_User_PostAuth(CLIENT *Client) { + REQUEST Req; + char modes[CLIENT_MODE_LEN + 1]; + assert(Client != NULL); if (Class_HandleServerBans(Client) != CONNECTED) @@ -185,8 +190,17 @@ Login_User_PostAuth(CLIENT *Client) if (!IRC_Show_MOTD(Client)) return DISCONNECTED; - /* Suspend the client for a second ... */ - IRC_SetPenalty(Client, 1); + /* Set default user modes */ + if (Conf_DefaultUserModes[0]) { + snprintf(modes, sizeof(modes), "+%s", Conf_DefaultUserModes); + Req.prefix = Client_ThisServer(); + Req.command = "MODE"; + Req.argc = 2; + Req.argv[0] = Client_ID(Client); + Req.argv[1] = modes; + IRC_MODE(Client, &Req); + } else + IRC_SetPenalty(Client, 1); return CONNECTED; }

1 0

Federico G. Schwindt : Change strdup() to strndup()
by alex＠arthur.barton.de 26 Aug '13

26 Aug '13

Module: ngircd.git Branch: master Commit: 3b65f4e38d1ab019513f16b70581ae10574006e8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3b65f4e3… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Mon Aug 26 12:18:46 2013 +0100 Change strdup() to strndup() --- src/ngircd/client.c | 3 ++- src/ngircd/conn-ssl.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 1c71034..72774ca 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -469,7 +469,8 @@ Client_SetAccountName(CLIENT *Client, const char *AccountName) free(Client->account_name); if (*AccountName) - Client->account_name = strdup(AccountName); + Client->account_name = strndup(AccountName, + CLIENT_NICK_LEN - 1); else Client->account_name = NULL; } diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index 4156fb1..096ff95 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -61,7 +61,7 @@ static gnutls_dh_params_t dh_params; static bool ConnSSL_LoadServerKey_gnutls PARAMS(( void )); #endif -#define CERTFP_LEN (20 * 2 + 1) +#define SHA1_STRING_LEN (20 * 2 + 1) static bool ConnSSL_Init_SSL PARAMS(( CONNECTION *c )); static int ConnectAccept PARAMS(( CONNECTION *c, bool connect )); @@ -723,7 +723,7 @@ ConnSSL_InitCertFp( CONNECTION *c ) assert(c->ssl_state.fingerprint == NULL); - c->ssl_state.fingerprint = malloc(CERTFP_LEN); + c->ssl_state.fingerprint = malloc(SHA1_STRING_LEN); if (!c->ssl_state.fingerprint) return 0; @@ -858,7 +858,7 @@ bool ConnSSL_SetCertFp(CONNECTION *c, const char *fingerprint) { assert (c != NULL); - c->ssl_state.fingerprint = strdup(fingerprint); + c->ssl_state.fingerprint = strndup(fingerprint, SHA1_STRING_LEN - 1); return c->ssl_state.fingerprint != NULL; } #else

1 0

Federico G. Schwindt : private strndup() implementation in case libc does not provide it
by alex＠arthur.barton.de 26 Aug '13

26 Aug '13

Module: ngircd.git Branch: master Commit: 6ac5a82eecb76ec35f3f484149ad668073a52620 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6ac5a82e… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Mon Aug 26 10:47:04 2013 +0100 private strndup() implementation in case libc does not provide it --- configure.ng | 2 +- src/portab/Makefile.ng | 2 +- src/portab/portab.h | 4 ++++ src/portab/strndup.c | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/configure.ng b/configure.ng index 7e85225..faf3086 100644 --- a/configure.ng +++ b/configure.ng @@ -188,7 +188,7 @@ AC_CHECK_FUNCS([ \ # Optional functions AC_CHECK_FUNCS_ONCE([ \ gai_strerror getaddrinfo getnameinfo inet_aton sigaction sigprocmask \ - snprintf vsnprintf strdup strlcpy strlcat strtok_r waitpid]) + snprintf vsnprintf strdup strndup strlcpy strlcat strtok_r waitpid]) # -- Configuration options -- diff --git a/src/portab/Makefile.ng b/src/portab/Makefile.ng index dac329f..17edbdf 100644 --- a/src/portab/Makefile.ng +++ b/src/portab/Makefile.ng @@ -15,7 +15,7 @@ EXTRA_DIST = Makefile.ng noinst_LIBRARIES = libngportab.a -libngportab_a_SOURCES = strdup.c strlcpy.c strtok_r.c vsnprintf.c waitpid.c +libngportab_a_SOURCES = strdup.c strndup.c strlcpy.c strtok_r.c vsnprintf.c waitpid.c check_PROGRAMS = portabtest diff --git a/src/portab/portab.h b/src/portab/portab.h index 208d350..a968a3b 100644 --- a/src/portab/portab.h +++ b/src/portab/portab.h @@ -157,6 +157,10 @@ extern size_t strlcpy PARAMS(( char *dst, const char *src, size_t size )); extern char * strdup PARAMS(( const char *s )); #endif +#ifndef HAVE_STRNDUP +extern char * strndup PARAMS((const char *s, size_t maxlen)); +#endif + #ifndef HAVE_STRTOK_R extern char * strtok_r PARAMS((char *str, const char *delim, char **saveptr)); #endif diff --git a/src/portab/strndup.c b/src/portab/strndup.c new file mode 100644 index 0000000..d6e01c9 --- /dev/null +++ b/src/portab/strndup.c @@ -0,0 +1,37 @@ +/* + * ngIRCd -- The Next Generation IRC Daemon + */ + +#include "portab.h" + +/** + * @file + * strndup() implementation. Public domain. + */ + +#ifndef HAVE_STRNDUP + +#include "imp.h" +#include <string.h> +#include <stdlib.h> +#include <sys/types.h> + +#include "exp.h" + +GLOBAL char * +strndup(const char *s, size_t maxlen) +{ + char *dup; + size_t len = strlen(s); + + if (len > maxlen) + len = maxlen; + len++; + dup = malloc(len); + if (dup) + strlcpy(dup, s, len); + return dup; +} + +#endif +

1 0

Federico G. Schwindt : Cosmetic changes to METADATA
by alex＠arthur.barton.de 25 Aug '13

25 Aug '13

Module: ngircd.git Branch: master Commit: 086cf3a2723e2dcc8e1acf49d166e254fe22e7cf URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=086cf3a2… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Sun Aug 25 05:26:08 2013 +0100 Cosmetic changes to METADATA Update certfp and sort entries. --- doc/Protocol.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Protocol.txt b/doc/Protocol.txt index ae290dd..6b3cfbc 100644 --- a/doc/Protocol.txt +++ b/doc/Protocol.txt @@ -225,11 +225,11 @@ new server link", <serverflag> "M"), even if it doesn't support the given The following <key> names are defined: - "accountname": the account name of a client (can't be empty) - - "host": the hostname of a client (can't be empty) + - "certfp": the certificate fingerprint of a client (can't be empty) - "cloakhost": the cloaked hostname of a client + - "host": the hostname of a client (can't be empty) - "info": info text ("real name") of a client - "user": the user name of a client (can't be empty) - - "certfp": the cert fingerprint of a client III. Numerics used by IRC+ Protocol

1 0

Federico G. Schwindt : Silence warning
by alex＠arthur.barton.de 25 Aug '13

25 Aug '13

Module: ngircd.git Branch: master Commit: 8d01be7bbd2bbfd2524384af3cb9bdefaa87ea48 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8d01be7b… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Sun Aug 25 00:07:06 2013 +0100 Silence warning Cast the result of the operation to long, not the time(NULL) call. On systems where sizeof(time_t) is other than long this will produce a warning. --- src/ngircd/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/log.c b/src/ngircd/log.c index 028f435..18fb6fa 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -53,7 +53,7 @@ Log_Message(int Level, const char *msg) if (!Is_Daemon) { /* log to console */ fprintf(stdout, "[%ld:%d %4ld] %s\n", (long)getpid(), Level, - (long)time(NULL) - NGIRCd_Start, msg); + (long)(time(NULL) - NGIRCd_Start), msg); fflush(stdout); } #ifdef SYSLOG

1 0

Federico G. Schwindt : Plug memory leak
by alex＠arthur.barton.de 25 Aug '13

25 Aug '13

Module: ngircd.git Branch: master Commit: eb86d234f8553cb018fe86483ee754817689439a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=eb86d234… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Fri Aug 23 11:43:28 2013 +0100 Plug memory leak --- src/ngircd/client.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 3269028..1c71034 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -126,6 +126,8 @@ Client_Exit( void ) next = (CLIENT *)c->next; if (c->account_name) free(c->account_name); + if (c->cloaked) + free(c->cloaked); free( c ); c = next; }

1 0

Federico G. Schwindt : Implement account login support
by alex＠arthur.barton.de 25 Aug '13

25 Aug '13

Module: ngircd.git Branch: master Commit: 3af0ece2bcf550cccd7b647c111ce503c2faa459 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3af0ece2… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Aug 22 14:40:30 2013 +0100 Implement account login support This is done via the `accountname' METADATA command and used to automatically identify users after netsplits or across service restarts. --- doc/Protocol.txt | 1 + src/ngircd/client.c | 35 +++++++++++++++++++++++++++++++++++ src/ngircd/client.h | 3 +++ src/ngircd/irc-metadata.c | 2 ++ 4 files changed, 41 insertions(+) diff --git a/doc/Protocol.txt b/doc/Protocol.txt index 59fa617..ae290dd 100644 --- a/doc/Protocol.txt +++ b/doc/Protocol.txt @@ -224,6 +224,7 @@ new server link", <serverflag> "M"), even if it doesn't support the given The following <key> names are defined: + - "accountname": the account name of a client (can't be empty) - "host": the hostname of a client (can't be empty) - "cloakhost": the cloaked hostname of a client - "info": info text ("real name") of a client diff --git a/src/ngircd/client.c b/src/ngircd/client.c index cf0720b..3269028 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -124,6 +124,8 @@ Client_Exit( void ) { cnt++; next = (CLIENT *)c->next; + if (c->account_name) + free(c->account_name); free( c ); c = next; } @@ -318,6 +320,8 @@ Client_Destroy( CLIENT *Client, const char *LogMsg, const char *FwdMsg, bool Sen } } + if (c->account_name) + free(c->account_name); if (c->cloaked) free(c->cloaked); free( c ); @@ -455,6 +459,21 @@ Client_SetFlags( CLIENT *Client, const char *Flags ) GLOBAL void +Client_SetAccountName(CLIENT *Client, const char *AccountName) +{ + assert(Client != NULL); + + if (Client->account_name) + free(Client->account_name); + + if (*AccountName) + Client->account_name = strdup(AccountName); + else + Client->account_name = NULL; +} + + +GLOBAL void Client_SetAway( CLIENT *Client, const char *Txt ) { /* Set AWAY reason of client */ @@ -973,6 +992,14 @@ Client_Away( CLIENT *Client ) } /* Client_Away */ +GLOBAL char * +Client_AccountName(CLIENT *Client) +{ + assert(Client != NULL); + return Client->account_name; +} + + /** * Make sure that a given nickname is valid. * @@ -1611,6 +1638,14 @@ Client_Announce(CLIENT * Client, CLIENT * Prefix, CLIENT * User) return DISCONNECTED; } + if (Client_AccountName(User)) { + if (!IRC_WriteStrClientPrefix(Client, Prefix, + "METADATA %s accountname :%s", + Client_ID(User), + Client_AccountName(User))) + return DISCONNECTED; + } + if (Conn_GetCertFp(Client_Conn(User))) { if (!IRC_WriteStrClientPrefix(Client, Prefix, "METADATA %s certfp :%s", diff --git a/src/ngircd/client.h b/src/ngircd/client.h index 6d5298f..702f114 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -59,6 +59,7 @@ typedef struct _CLIENT bool oper_by_me; /* client is local IRC operator on this server? */ char away[CLIENT_AWAY_LEN]; /* AWAY text (valid if mode 'a' is set) */ char flags[CLIENT_FLAGS_LEN]; /* flags of the client */ + char *account_name; /* login account (for services) */ int capabilities; /* enabled IRC capabilities */ } CLIENT; @@ -123,6 +124,7 @@ GLOBAL int Client_MyToken PARAMS(( CLIENT *Client )); GLOBAL CLIENT *Client_TopServer PARAMS(( CLIENT *Client )); GLOBAL CLIENT *Client_NextHop PARAMS(( CLIENT *Client )); GLOBAL char *Client_Away PARAMS(( CLIENT *Client )); +GLOBAL char *Client_AccountName PARAMS((CLIENT *Client)); GLOBAL time_t Client_StartTime PARAMS(( CLIENT *Client )); GLOBAL bool Client_HasMode PARAMS(( CLIENT *Client, char Mode )); @@ -141,6 +143,7 @@ GLOBAL void Client_SetModes PARAMS(( CLIENT *Client, const char *Modes )); GLOBAL void Client_SetFlags PARAMS(( CLIENT *Client, const char *Flags )); GLOBAL void Client_SetIntroducer PARAMS(( CLIENT *Client, CLIENT *Introducer )); GLOBAL void Client_SetAway PARAMS(( CLIENT *Client, const char *Txt )); +GLOBAL void Client_SetAccountName PARAMS((CLIENT *Client, const char *AccountName)); GLOBAL bool Client_ModeAdd PARAMS(( CLIENT *Client, char Mode )); GLOBAL bool Client_ModeDel PARAMS(( CLIENT *Client, char Mode )); diff --git a/src/ngircd/irc-metadata.c b/src/ngircd/irc-metadata.c index 9a1398a..b52512a 100644 --- a/src/ngircd/irc-metadata.c +++ b/src/ngircd/irc-metadata.c @@ -96,6 +96,8 @@ IRC_METADATA(CLIENT *Client, REQUEST *Req) Client_SetInfo(target, Req->argv[2]); else if (*Req->argv[2] && strcasecmp(Req->argv[1], "user") == 0) Client_SetUser(target, Req->argv[2], true); + else if (strcasecmp(Req->argv[1], "accountname") == 0) + Client_SetAccountName(target, Req->argv[2]); else if (*Req->argv[2] && strcasecmp(Req->argv[1], "certfp") == 0) Conn_SetCertFp(Client_Conn(target), Req->argv[2]); else

1 0

Federico G. Schwindt : Fix spelling
by alex＠arthur.barton.de 25 Aug '13

25 Aug '13

Module: ngircd.git Branch: master Commit: a9ffbdea3f3e245326eaa4242f97803b6edad522 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a9ffbdea… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Aug 22 10:58:36 2013 +0100 Fix spelling --- src/ngircd/irc-metadata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/irc-metadata.c b/src/ngircd/irc-metadata.c index 14ffe35..9a1398a 100644 --- a/src/ngircd/irc-metadata.c +++ b/src/ngircd/irc-metadata.c @@ -69,7 +69,7 @@ IRC_METADATA(CLIENT *Client, REQUEST *Req) Client_ID(prefix), Client_ID(target), Req->argv[1], Req->argv[2]); - /* Mark client: it has receiveda a METADATA command */ + /* Mark client: it has received a METADATA command */ if (!Client_HasFlag(target, 'M')) { snprintf(new_flags, sizeof new_flags, "%sM", Client_Flags(target));

1 0