changeset 707:668b4d544afe

[gaim-migrate @ 717] la la la. libfaim changes, this time all of it was me. removed the permit/deny stuff, it was waaaaaay too buggy. also made it so aim_conn_kill closed the connection too. committer: Tailor Script <[e-mail]>

--- a/libfaim/CHANGES.gaim	Thu Aug 17 07:27:46 2000 +0000
+++ b/libfaim/CHANGES.gaim	Thu Aug 17 08:06:23 2000 +0000
@@ -1,3 +1,8 @@
+
+Thu Aug 17 07:56:49 UTC 2000 EWarmenhoven
+	- The permit/deny stuff is warped. It's untested and just doesn't
+	  work. I'm diabling it in gaim. If you want to deny someone,
+	  use TOC.
 
 Tue Aug  8 21:04:30 UTC 2000 EWarmenhoven
 	- Solaris doesn't have getaddrinfo(). Well, old versions of Solaris

--- a/libfaim/README.gaim	Thu Aug 17 07:27:46 2000 +0000
+++ b/libfaim/README.gaim	Thu Aug 17 08:06:23 2000 +0000
@@ -15,6 +15,7 @@
 - remove mkbuildinfo.sh and put the #defines it creates into Makefile.am
 - fix a typo in aim.h - "aim_directim_initiate", not "aim_directim_intiate"
 - add #if HAVE_GETADDRINFO in aim_ft.c for Solaris people
+- aim_conn_kill wasn't close()'ing connections, so I added that
 
 And finally, a word of warning. Gaim/Faim is VERY buggy. Please, don't use this
 for anything other than laughs right now. Hopefully we'll get it working better
@@ -42,7 +43,6 @@
 Setting your info
 Getting users' info
 Getting users' away messages
-Telling the server who's on your permit/deny lists
 Chat:
  - joining rooms
  - leaving rooms
@@ -55,6 +55,7 @@
 
 CURRENTLY UNSUPPORTED FEATURES
 ==============================
+Telling the server who's on your permit/deny lists
 Warning users/getting warned
 Chat:
  - whispering (this will never happen)
@@ -69,8 +70,8 @@
 - Oscar doesn't do whispering in chat rooms any more (and hasn't for quite a
 while, evidently). So if you want to "whisper" to someone, just IM them.
 
-- The permit/deny list stuff is really warped. I'm probably going to comment it
-out soon and try to figure out what's going on.
+- The permit/deny list stuff is really warped. I've commented it out; the code
+in libfaim is untested and it's causing way too many problems.
 
 - "Allow anyone" and "Deny some" serve the same function. That's not a bug. But
 "Allow anyone" works all the time (?) and "Deny some" doesn't work some of the

--- a/libfaim/aim_conn.c	Thu Aug 17 07:27:46 2000 +0000
+++ b/libfaim/aim_conn.c	Thu Aug 17 08:06:23 2000 +0000
@@ -102,6 +102,7 @@
   /* XXX: do we need this for txqueue too? */
   aim_rxqueue_cleanbyconn(sess, *deadconn);
 
+  close((*deadconn)->fd);
   aim_conn_init(*deadconn);
   free(*deadconn);
   deadconn = NULL;

--- a/src/server.c	Thu Aug 17 07:27:46 2000 +0000
+++ b/src/server.c	Thu Aug 17 08:06:23 2000 +0000
@@ -415,25 +415,21 @@
 			break;
 		}
 	} else {
+/*
 		int at;
 		GList *list;
 		char buf[MSG_LEN];
 
 		switch (permdeny) {
-		/* aim_bos_changevisibility(gaim_sess, gaim_conn, type, list) */
 		case PERMIT_ALL:
-			/* AIM_VISIBILITYCHANGE_DENYADD current_user */
 			aim_bos_changevisibility(gaim_sess, gaim_conn,
 			   AIM_VISIBILITYCHANGE_DENYADD, current_user->username);
 			break;
 		case PERMIT_NONE:
-			/* AIM_VISIBILITY_PERMITADD current_user */
 			aim_bos_changevisibility(gaim_sess, gaim_conn,
 			   AIM_VISIBILITYCHANGE_PERMITADD, current_user->username);
 			break;
 		case PERMIT_SOME:
-			/* PERMIT <permit> */
-			/* if permit is empty this is the same as PERMIT_NONE */
 			at = g_snprintf(buf, sizeof(buf), "%s", current_user->username);
 			list = permit;
 			while (list) {
@@ -445,8 +441,6 @@
 			   AIM_VISIBILITYCHANGE_PERMITADD, buf);
 			break;
 		case DENY_SOME:
-			/* DENY <deny> */
-			/* if deny is empty this is the same as PERMIT_ALL */
 			if (deny) {
 				at = 0;
 				list = deny;
@@ -466,6 +460,7 @@
 			}
 			break;
 		}
+*/
 	}
 }