@@ -1,3 +1,7 @@

+Tue Jul 11 18:45:22 BST 2006 (njh)

+----------------------------------

+  * clamav-milter:	Use tableUpdate() to maintain the blacklist

+

 Tue Jul 11 16:26:46 BST 2006 (njh)

 ----------------------------------

   * clamav-milter:	Added -I flag based on an idea by

@@ -23,7 +23,7 @@

  *

  * For installation instructions see the file INSTALL that came with this file

  */

-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.248 2006/07/11 15:25:26 njh Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.249 2006/07/11 17:46:30 njh Exp $";

 #define	CM_VERSION	"devel-210606"

@@ -3390,11 +3390,7 @@ clamfi_eom(SMFICTX *ctx)

 		if(privdata->ip) {

 			pthread_mutex_lock(&blacklist_mutex);

-			/*

-			 * FIXME: should be able to update here, otherwise we

-			 * can't reblacklist an entry that has timed out

-			 */

-			(void)tableInsert(blacklist, privdata->ip,

+			(void)tableUpdate(blacklist, privdata->ip,

 				(int)time((time_t *)0));

 			pthread_mutex_unlock(&blacklist_mutex);

 			free(privdata->ip);

@@ -5565,7 +5561,7 @@ mx(void)

 	u_char buf[BUFSIZ];

 	union {

 		HEADER h;

-		u_char	u[PACKETSZ];

+		u_char u[PACKETSZ];

 	} q;

 	const HEADER *hp;

 	int len, i;

@@ -5637,7 +5633,7 @@ resolve(const char *host)

 	u_char buf[BUFSIZ];

 	union {

 		HEADER h;

-		u_char	u[PACKETSZ];

+		u_char u[PACKETSZ];

 	} q;

 	const HEADER *hp;

 	int len, i;

@@ -15,6 +15,10 @@

  *  along with this program; if not, write to the Free Software

  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

  *  MA 02110-1301, USA.

+ *

+ * TODO: Allow individual items to be updated or removed

+ *

+ * It is up to the caller to create a mutex for the table if needed

  */

 #if HAVE_CONFIG_H

@@ -92,7 +96,8 @@ tableInsert(table_t *table, const char *key, int value)

 }

 /*

- * Returns the value - -1 for not found

+ * Returns the value - -1 for not found. This means the value of a valid key

+ *	can't be -1 :-(

  */

 int

 tableFind(const table_t *table, const char *key)

@@ -128,3 +133,31 @@ tableFind(const table_t *table, const char *key)

 	return -1;	/* not found */

 }

+

+/*

+ * Change a value in the table. If the key isn't in the table insert it

+ * Returns -1 for error, otherwise the new value

+ */

+int

+tableUpdate(table_t *table, const char *key, int new_value)

+{

+	tableEntry *tableItem;

+

+	assert(table != NULL);

+

+	if(key == NULL)

+		return -1;	/* not treated as a fatal error */

+

+	if(table->tableHead == NULL)

+		/* not populated yet */

+		return tableInsert(table, key, new_value);

+

+	for(tableItem = table->tableHead; tableItem; tableItem = tableItem->next)

+		if(strcasecmp(tableItem->key, key) == 0) {

+			tableItem->value = new_value;

+			return new_value;

+		}

+

+	/* not found */

+	return tableInsert(table, key, new_value);

+}

@@ -34,4 +34,5 @@ typedef struct table {

 struct	table	*tableCreate(void);

 void	tableDestroy(table_t *table);

 int	tableInsert(table_t *table, const char *key, int value);

+int	tableUpdate(table_t *table, const char *key, int new_value);

 int	tableFind(const table_t *table, const char *key);