noffle: src/client.c comparison

comparison src/client.c @ 180:09ca6eb5c7ff noffle

[svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: Improve error checking during fetches. A fetch is now aborted immediately if the connection times out or if an unexpected response arrives. This should fix problems with articles appearing in the wrong group, and possibly other mysterious happenings.

author	bears
date	Wed, 09 May 2001 12:33:43 +0100
parents	0ce333d046b9
children	a43a528cfbe7

comparison

equal deleted inserted replaced

-:f973675760dc
+:09ca6eb5c7ff
 /*
 client.c
-$Id: client.c 269 2001-03-13 11:46:03Z enz $
+$Id: client.c 279 2001-05-09 11:33:43Z bears $
 */
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
 return putCmdLn( line );
 }
 static int getStat( void );
-static Bool
+static int
 performAuth( void )
 {
 int stat;
 Str user, pass;
 Cfg_authInfo( client.serv, user, pass );
 if ( strcmp( user, "" ) == 0 )
 {
 Log_err( "No username for authentication set" );
-return FALSE;
+return STAT_AUTH_REQUIRED;
 }
 putCmd( "AUTHINFO USER %s", user );
 stat = getStat();
 if ( stat == STAT_AUTH_ACCEPTED )
-return TRUE;
+return stat;
 else if ( stat != STAT_MORE_AUTH_REQUIRED )
 {
 Log_err( "Username rejected. Server stat: %s", client.lastStat );
-return FALSE;
+return stat;
 }
 if ( strcmp( pass, "" ) == 0 )
 {
 Log_err( "No password for authentication set" );
-return FALSE;
+return STAT_AUTH_REQUIRED;
 }
 putCmd( "AUTHINFO PASS %s", pass );
 stat = getStat();
 if ( stat != STAT_AUTH_ACCEPTED )
-{
 Log_err( "Password rejected. Server status: %s", client.lastStat );
-return FALSE;
+return stat;
-}
-return TRUE;
 }
 static int
 getStat( void )
 {
 }
 if ( result == STAT_AUTH_REQUIRED && ! client.auth )
 {
 client.auth = TRUE;
 strcpy( lastCmd, client.lastCmd );
-if ( performAuth() )
+	result = performAuth();
+if ( result == STAT_AUTH_ACCEPTED )
 {
 putCmd( lastCmd );
 return getStat();
 }
 }
 *noServerPattern = FALSE;
 if ( ! putCmd( cmd ) )
 return FALSE;
 stat = getStat();
+if ( stat == STAT_PROGRAM_FAULT )
+	return FALSE;
+/*
+* Try LIST instead of LIST ACTIVE in case server doesn't
+* support LIST ACTIVE.
+*/
 if ( pattern[ 0 ] != '\0' && stat != STAT_GRPS_FOLLOW )
 {
 	*noServerPattern = TRUE;
 	if ( ! putCmd( "LIST" ) )
 	    return FALSE;
 {
 Str name, line, dsc, cmd;
 int stat;
 DynStr *response;
 const char *lines;
+Bool result;
 ASSERT( ! Lock_gotLock() );
 Utl_cpyStr( cmd, "LIST NEWSGROUPS" );
 if ( pattern[ 0 ] != '\0' )
 {
 *noServerPattern = FALSE;
 if ( ! putCmd( cmd ) )
 return FALSE;
 stat = getStat();
+if ( stat == STAT_PROGRAM_FAULT )
+	return FALSE;
+/* Try without pattern in case server doesn't support patterns. */
 if ( pattern[ 0 ] != '\0' && stat != STAT_GRPS_FOLLOW )
 {
 	*noServerPattern = TRUE;
 	if ( !putCmd( "LIST NEWSGROUPS" ) )
 	     return FALSE;
 if ( ! Lock_openDatabases() )
 	return FALSE;
 lines = DynStr_str( response );
+result = TRUE;
 while ( ( lines = Utl_getLn( line, lines) ) != NULL )
 {
 if ( sscanf( line, "%s", name ) != 1 )
 {
 Log_err( "Unknown reply to LIST NEWSGROUPS: %s", line );
-continue;
+	    result = FALSE;
+	    break;
 }
 	if ( *noServerPattern && ! isGetGroup( name ) )
 	    continue;
 strcpy( dsc, Utl_restOfLn( line, 1 ) );
 if ( Grp_exists( name ) )
 Grp_setDsc( name, dsc );
 }
 }
 Lock_closeDatabases();
 del_DynStr( response );
-return TRUE;
+return result;
 }
 Bool
 Client_getDsc( void )
 {
 	doneOne = TRUE;
 	if ( noServerPattern )
 	    break;
 }
-if ( ! doneOne )
+if ( res && ! doneOne )
 	res = doGetDsc( "", &noServerPattern );
 del_GrEn( ge );
 return res;
 }
 	Log_dbg( "Requesting Newsgroups headers for remote %lu-%lu",
 		 rmtFirst, rmtLast );
 	newsgroups = collectTxt();
+	if ( newsgroups == NULL )
+	    return FALSE;
 	groupLines = DynStr_str( newsgroups );
 }
 else
 {
 	groupLines = NULL;
 else
 retrievingFailed( msgId, "Connection broke down" );
 return ! err;
 }
-void
+Bool
 Client_retrieveArt( const char *msgId )
 {
+Bool res = FALSE;
 ASSERT( Lock_gotLock() );
 if ( ! Db_contains( msgId ) )
 {
 Log_err( "Article '%s' not prepared in database. Skipping.", msgId );
-return;
+return TRUE;
 }
 if ( ! ( Db_status( msgId ) & DB_NOT_DOWNLOADED ) )
 {
 Log_inf( "Article '%s' already retrieved. Skipping.", msgId );
-return;
+return TRUE;
 }
 Lock_closeDatabases();
 if ( ! putCmd( "ARTICLE %s", msgId ) )
 retrievingFailed( msgId, "Connection broke down" );
 else if ( getStat() != STAT_ART_FOLLOWS )
 retrievingFailed( msgId, client.lastStat );
 else
-retrieveAndStoreArt( msgId, 0, 0 );
+res = retrieveAndStoreArt( msgId, 0, 0 );
 Lock_openDatabases();
-}
+return res;
+}
-void
+Bool
 Client_retrieveArtList( const char *list, int *artcnt, int artmax )
 {
 Str msgId;
 DynStr *s;
 const char *p;
+Bool res;
 ASSERT( Lock_gotLock() );
 Log_inf( "Retrieving article list" );
 s = new_DynStr( (int)strlen( list ) );
 p = list;
 Log_inf( "[%d/%d] Skipping %s (already retrieved)", ++(*artcnt), artmax, msgId );
 else if ( ! putCmdNoFlush( "ARTICLE %s", msgId ) )
 {
 retrievingFailed( msgId, "Connection broke down" );
 del_DynStr( s );
-return;
+return FALSE;
 }
 else
 DynStr_appLn( s, msgId );
 Lock_closeDatabases();
 fflush( client.out );
 Log_dbg( "[S FLUSH]" );
 p = DynStr_str( s );
-while ( ( p = Utl_getLn( msgId, p ) ) )
+res = TRUE;
+while ( res && ( p = Utl_getLn( msgId, p ) ) )
 {
 if ( getStat() != STAT_ART_FOLLOWS )
+	{
 retrievingFailed( msgId, client.lastStat );
-else if ( ! retrieveAndStoreArt( msgId, ++(*artcnt), artmax ) )
+	    res = FALSE;
-break;
+	}
+else
+	    res = retrieveAndStoreArt( msgId, ++(*artcnt), artmax );
 }
 del_DynStr( s );
 Lock_openDatabases();
+return res;
 }
 Bool
 Client_changeToGrp( const char* name )
 {
 *first = client.rmtFirst;
 *last = client.rmtLast;
 }
 Bool
-Client_postArt( const char *msgId, const char *artTxt,
+Client_postArt( const char *msgId, const char *artTxt, Str errStr )
-Str errStr )
+{
-{
+int stat;
+errStr[0] = '\0';
 if ( ! putCmd( "POST" ) )
 return FALSE;
-if ( getStat() != STAT_SEND_ART )
+stat = getStat();
+if ( stat == STAT_PROGRAM_FAULT )
+	return FALSE;
+else if ( stat != STAT_SEND_ART )
 {
 Log_err( "Posting of %s not allowed: %s", msgId, client.lastStat );
 strcpy( errStr, client.lastStat );
-return FALSE;
+return TRUE;
 }
 putTxtBuf( artTxt );
 putEndOfTxt();
-if ( getStat() != STAT_POST_OK )
+stat = getStat();
+if ( stat == STAT_PROGRAM_FAULT )
+	return FALSE;
+else if ( stat != STAT_POST_OK )
 {
 Log_err( "Posting of %s failed: %s", msgId, client.lastStat );
 strcpy( errStr, client.lastStat );
-return FALSE;
+return TRUE;
 }
 Log_inf( "Posted %s (Status: %s)", msgId, client.lastStat );
 return TRUE;
 }

Mercurial > noffle

comparison src/client.c @ 180:09ca6eb5c7ff noffle