[minion-cvs] Checkpointing before the great push to get a server wor...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/src
In directory moria.seul.org:/tmp/cvs-serv1509/minion/src

Modified Files:
	_minionlib.h main.c tls.c 
Log Message:
Checkpointing before the great push to get a server working.

Added configuration support.  Made logs and shred configurable.

Made unexpected closes get handled correctly.

Made shredding work correctly.

Added tests for keyid mismatch.


Index: _minionlib.h
===================================================================
RCS file: /home/minion/cvsroot/src/minion/src/_minionlib.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- _minionlib.h	5 Jul 2002 23:34:33 -0000	1.6
+++ _minionlib.h	25 Jul 2002 15:52:57 -0000	1.7
@@ -76,6 +76,8 @@
 extern char mm_TLSWantRead__doc__[];
 extern PyObject *mm_TLSWantWrite;
 extern char mm_TLSWantWrite__doc__[];
+extern PyObject *mm_TLSClosed;
+extern char mm_TLSClosed__doc__[];
 
 #endif
 

Index: main.c
===================================================================
RCS file: /home/minion/cvsroot/src/minion/src/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- main.c	5 Jul 2002 23:34:33 -0000	1.5
+++ main.c	25 Jul 2002 15:52:57 -0000	1.6
@@ -103,6 +103,9 @@
 	if (exc(d, &mm_TLSWantWrite, "mixminion._minionlib.TLSWantWrite", 
 		"TLSWantWrite", mm_TLSWantWrite__doc__))
 		return;
+	if (exc(d, &mm_TLSClosed, "mixminion._minionlib.TLSClosed", 
+		"TLSClosed", mm_TLSClosed__doc__))
+		return;
 
 	Py_INCREF(&mm_RSA_Type);
 	if (PyDict_SetItemString(d, "RSA", (PyObject*)&mm_RSA_Type) < 0)

Index: tls.c
===================================================================
RCS file: /home/minion/cvsroot/src/minion/src/tls.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tls.c	5 Jul 2002 23:34:33 -0000	1.4
+++ tls.c	25 Jul 2002 15:52:57 -0000	1.5
@@ -20,6 +20,11 @@
 "Exception raised when a non-blocking TLS operation would block on writing.\n";
 PyObject *mm_TLSWantWrite = NULL;
 
+char mm_TLSClosed__doc__[] = 
+  "mixminion._minionlib.TLSClosed\n\n"
+"Exception raised when a connection is unexpectedly closed.\n";
+PyObject *mm_TLSClosed = NULL;
+
 /* Convenience macro to set a type error with a given string. */
 #define TYPE_ERR(s) PyErr_SetString(PyExc_TypeError, s)
 
@@ -59,9 +64,8 @@
 		  PyErr_SetNone(mm_TLSWantWrite);
 		  return ERROR;
  	  case SSL_ERROR_SYSCALL:
-		  /* ???? We may want to act differently here; this is
-		   * ???? (almost?) always an unexpected close. 
-		   */
+		  PyErr_SetNone(mm_TLSClosed);
+		  return ERROR;
  	  default:
 		  mm_SSL_ERR(0);
 		  return ERROR;