commit 9146fa253459caf33fe8420b969e8f63d307caa0 from: Alexander Barton date: Tue Mar 12 23:42:59 2002 UTC - Projektdatei an neue Quellcode-Struktur angepasst. commit - 882c91280e46c62274ad6b77677d02fba342efda commit + 9146fa253459caf33fe8420b969e8f63d307caa0 blob - a307e544152cc46db4ac9277d24ff9c371d5f8aa blob + 2fea6f203f762418d406b65fa889901a9b7f22fb --- MacOSX/ngircd.pbproj/project.pbxproj +++ MacOSX/ngircd.pbproj/project.pbxproj @@ -113,7 +113,6 @@ 08FB77A0FE84155DC02AAC07 = { buildActionMask = 2147483647; files = ( - F52162CD01C7B904012300F4, F52162CE01C7B904012300F4, F52162CF01C7B904012300F4, F52162D001C7B904012300F4, @@ -132,6 +131,9 @@ F57C88870232853501A85B04, F57C888B0232884501A85B04, F57C888F02328D7201A85B04, + F5F18138023EC63701A85B04, + F5F18139023EC63701A85B04, + F5F1813A023EC63701A85B04, ); isa = PBXHeadersBuildPhase; name = Headers; @@ -376,6 +378,7 @@ F52162B801C7B904012300F4, F52162D801C7BAAE012300F4, F52162B901C7B904012300F4, + F5F18132023EC61E01A85B04, ); isa = PBXGroup; name = src; @@ -390,7 +393,6 @@ F52162B901C7B904012300F4 = { children = ( F52162BD01C7B904012300F4, - F52162BA01C7B904012300F4, F52162BE01C7B904012300F4, F52162BF01C7B904012300F4, F51D180001C8FDD001E11C2E, @@ -428,11 +430,6 @@ path = ngircd; refType = 4; }; - F52162BA01C7B904012300F4 = { - isa = PBXFileReference; - path = global.h; - refType = 4; - }; F52162BB01C7B904012300F4 = { isa = PBXFileReference; path = log.c; @@ -522,12 +519,6 @@ path = ../README; refType = 2; }; - F52162CD01C7B904012300F4 = { - fileRef = F52162BA01C7B904012300F4; - isa = PBXBuildFile; - settings = { - }; - }; F52162CE01C7B904012300F4 = { fileRef = F52162BC01C7B904012300F4; isa = PBXBuildFile; @@ -760,10 +751,71 @@ }; F57C889002328D7201A85B04 = { fileRef = F57C888D02328D7201A85B04; + isa = PBXBuildFile; + settings = { + }; + }; + F5F18132023EC61E01A85B04 = { + children = ( + F5F18133023EC63701A85B04, + F5F18134023EC63701A85B04, + F5F18135023EC63701A85B04, + F5F18136023EC63701A85B04, + F5F18137023EC63701A85B04, + ); + isa = PBXGroup; + name = portab; + path = /Users/alex/Develop/ngircd/src; + refType = 0; + }; + F5F18133023EC63701A85B04 = { + isa = PBXFileReference; + name = Makefile.am; + path = portab/Makefile.am; + refType = 4; + }; + F5F18134023EC63701A85B04 = { + isa = PBXFileReference; + name = exp.h; + path = portab/exp.h; + refType = 4; + }; + F5F18135023EC63701A85B04 = { + isa = PBXFileReference; + name = imp.h; + path = portab/imp.h; + refType = 4; + }; + F5F18136023EC63701A85B04 = { + isa = PBXFileReference; + name = portab.h; + path = portab/portab.h; + refType = 4; + }; + F5F18137023EC63701A85B04 = { + isa = PBXFileReference; + name = portabtest.c; + path = portab/portabtest.c; + refType = 4; + }; + F5F18138023EC63701A85B04 = { + fileRef = F5F18134023EC63701A85B04; isa = PBXBuildFile; settings = { }; }; + F5F18139023EC63701A85B04 = { + fileRef = F5F18135023EC63701A85B04; + isa = PBXBuildFile; + settings = { + }; + }; + F5F1813A023EC63701A85B04 = { + fileRef = F5F18136023EC63701A85B04; + isa = PBXBuildFile; + settings = { + }; + }; }; rootObject = 08FB7793FE84155DC02AAC07; } blob - bb0e87ef3d92d5bbc3a48e939de143a3a6a4e4df blob + 0257e9644902f269fcdbf81822f63b5b47af0581 --- src/ngircd/client.c +++ src/ngircd/client.c @@ -9,7 +9,7 @@ * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * - * $Id: client.c,v 1.48 2002/03/12 14:37:52 alex Exp $ + * $Id: client.c,v 1.49 2002/03/12 23:42:59 alex Exp $ * * client.c: Management aller Clients * @@ -188,11 +188,8 @@ GLOBAL VOID Client_Destroy( CLIENT *Client, CHAR *LogM else txt = FwdMsg; if( ! txt ) txt = "Reason unknown."; - if( Client->type == CLIENT_SERVER ) - { - /* Netz-Split-Nachricht vorbereiten */ - sprintf( msg, "%s | %s", Client_ID( Client ), Client_ID( Client_TopServer( Client ) ? Client_TopServer( Client ) : Client_ThisServer( ))); - } + /* Netz-Split-Nachricht vorbereiten */ + if( Client->type == CLIENT_SERVER ) sprintf( msg, "%s: lost server %s", This_Server->id, Client->id ); last = NULL; c = My_Clients; blob - e7a756695fa33ed7a91645af250aaf9e23701c0a blob + 639f827f000b9057521eda62b1d076c617a8d4aa --- src/ngircd/conn.c +++ src/ngircd/conn.c @@ -9,7 +9,7 @@ * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * - * $Id: conn.c,v 1.52 2002/03/12 14:37:52 alex Exp $ + * $Id: conn.c,v 1.53 2002/03/12 23:42:59 alex Exp $ * * connect.h: Verwaltung aller Netz-Verbindungen ("connections") */ @@ -850,8 +850,10 @@ LOCAL VOID Check_Servers( VOID ) /* Haben wir schon eine Verbindung? */ for( n = 0; n < MAX_CONNECTIONS; n++ ) { + if( My_Connections[n].sock == NONE ) continue; + /* Verbindung zu diesem Server? */ - if(( My_Connections[n].sock != NONE ) && ( My_Connections[n].our_server == i )) + if( My_Connections[n].our_server == i ) { /* Komplett aufgebaute Verbindung? */ if( My_Connections[n].sock > NONE ) break; @@ -861,9 +863,9 @@ LOCAL VOID Check_Servers( VOID ) } /* Verbindung in dieser Server-Gruppe? */ - if(( My_Connections[n].sock != NONE ) && ( My_Connections[n].our_server != NONE )) + if(( My_Connections[n].our_server != NONE ) && ( Conf_Server[i].group != NONE )) { - if( Conf_Server[n].group == Conf_Server[i].group != NONE ) break; + if( Conf_Server[My_Connections[n].our_server].group == Conf_Server[i].group ) break; } } if( n < MAX_CONNECTIONS ) continue;