[pywin32-checkins] pywin32/isapi/src PyFilterObjects.cpp,1.2,1.3 PyFilterObjects.h,1.1,1.2

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/isapi/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1033

Modified Files:
	PyFilterObjects.cpp PyFilterObjects.h 
Log Message:
Add HTTP_FILTER_LOG support


Index: PyFilterObjects.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/isapi/src/PyFilterObjects.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyFilterObjects.h	6 Oct 2004 05:11:53 -0000	1.1
--- PyFilterObjects.h	27 Jul 2005 06:15:52 -0000	1.2
***************
*** 110,113 ****
--- 110,128 ----
  };
  
+ class PyFILTER_LOG:public PyObject
+ {
+ public:
+ 	PyHFC *m_parent;
+ public:
+ 	PyFILTER_LOG(PyHFC *);
+ 	~PyFILTER_LOG();
+ 	HTTP_FILTER_LOG *GetFilterLog();
+ public:	
+ 	// Python support 
+ 	static void deallocFunc(PyObject *ob);
+ 	static PyObject *getattr(PyObject *self, char *name);
+ 	static int setattr(PyObject *self, char *name, PyObject *v);
+ };
+ 
  
  // error handling

Index: PyFilterObjects.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/isapi/src/PyFilterObjects.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyFilterObjects.cpp	26 Oct 2004 01:30:30 -0000	1.2
--- PyFilterObjects.cpp	27 Jul 2005 06:15:52 -0000	1.3
***************
*** 160,163 ****
--- 160,166 ----
  		case SF_NOTIFY_PREPROC_HEADERS:
  			return new PyPREPROC_HEADERS(me);
+ 		// @flag SF_NOTIFY_LOG|<o HTTP_FILTER_LOG>
+ 		case SF_NOTIFY_LOG:
+ 			return new PyFILTER_LOG(me);
  		default:
  			PyErr_Format(PyExc_ValueError, "Don't understand data of type 0x%x", me->m_notificationType);
***************
*** 614,615 ****
--- 617,756 ----
  }
  
+ /////////////////////////////////////////////////////////////////////////
+ // PyFILTER_LOG object
+ /////////////////////////////////////////////////////////////////////////
+ // @object HTTP_FILTER_LOG|A Python representation of an ISAPI
+ // HTTP_FILTER_LOG structure.
+ PyTypeObject PyFILTER_LOGType =
+ {
+ 	PyObject_HEAD_INIT(&PyType_Type)
+ 	0,
+ 	"HTTP_FILTER_LOG",
+ 	sizeof(PyFILTER_LOG),
+ 	0,
+ 	PyFILTER_LOG::deallocFunc,	/* tp_dealloc */
+ 	0,					/* tp_print */
+ 	PyFILTER_LOG::getattr,		/* tp_getattr */
+ 	PyFILTER_LOG::setattr,		/* tp_setattr */
+ 	0,
+ 	0,					/* tp_repr */
+ 	0,					/* tp_as_number */
+ 	0,					/* tp_as_sequence */
+ 	0,					/* tp_as_mapping */
+ 	0,
+ 	0,					/* tp_call */
+ 	0,					/* tp_str */
+ };
+ 
+ 
+ PyFILTER_LOG::PyFILTER_LOG(PyHFC *pParent)
+ {
+ 	ob_type = &PyFILTER_LOGType;
+ 	_Py_NewReference(this);
+ 
+ 	m_parent = pParent;
+ 	Py_INCREF(m_parent);
+ }
+ 
+ PyFILTER_LOG::~PyFILTER_LOG()
+ {
+ 	Py_XDECREF(m_parent);
+ }
+ 
+ HTTP_FILTER_LOG *PyFILTER_LOG::GetFilterLog()
+ {
+ 	HTTP_FILTER_CONTEXT *pFC;
+ 	void *vdata;
+ 	DWORD requestType;
+     m_parent->GetFilterContext()->GetFilterData(&pFC, &requestType, &vdata);
+     assert(requestType==SF_NOTIFY_LOG);
+     return (HTTP_FILTER_LOG *)vdata;
+ 
+ }
+ 
+ PyObject *PyFILTER_LOG::getattr(PyObject *self, char *name)
+ {
+ 	HTTP_FILTER_LOG *pLog = ((PyFILTER_LOG *)self)->GetFilterLog();
+ 	if (!pLog)
+ 		return NULL;
+ 	// @prop string|ClientHostName|
+ 	if (strcmp(name, "ClientHostName")==0)
+ 		return PyString_FromString(pLog->pszClientHostName);
+ 	// @prop string|ClientUserName|
+ 	if (strcmp(name, "ClientUserName")==0)
+ 		return PyString_FromString(pLog->pszClientUserName);
+ 	// @prop string|ServerName|
+ 	if (strcmp(name, "ServerName")==0)
+ 		return PyString_FromString(pLog->pszServerName);
+ 	// @prop string|Operation|
+ 	if (strcmp(name, "Operation")==0)
+ 		return PyString_FromString(pLog->pszOperation);
+ 	// @prop string|Target|
+ 	if (strcmp(name, "Target")==0)
+ 		return PyString_FromString(pLog->pszTarget);
+ 	// @prop string|Parameters|
+ 	if (strcmp(name, "Parameters")==0)
+ 		return PyString_FromString(pLog->pszParameters);
+ 	// @prop int|HttpStatus|
+ 	if (strcmp(name, "HttpStatus")==0)
+ 		return PyInt_FromLong(pLog->dwHttpStatus);
+ 	// @prop int|HttpStatus|
+ 	if (strcmp(name, "Win32Status")==0)
+ 		return PyInt_FromLong(pLog->dwWin32Status);
+ 	PyErr_Format(PyExc_AttributeError, "PyFILTER_LOG objects have no attribute '%s'", name);
+ 	return NULL;
+ }
+ 
+ // Note that to set the strings, we use the AllocMem function - this allows
+ // IIS to automatically free the memory once the request has completed.
+ 
+ #define CHECK_SET_FILTER_LOG_STRING(struct_elem) \
+ 	if (strcmp(name, #struct_elem)==0) { \
+ 		if (!PyString_Check(v)) { \
+ 			PyErr_Format(PyExc_TypeError, #struct_elem " must be a string"); \
+ 			return -1; \
+ 		} \
+ 		int cc = PyString_Size(v) + sizeof(CHAR); \
+ 		char *buf = (char *)pFC->AllocMem(pFC, cc, 0); \
+ 		if (!buf) { \
+ 			PyErr_NoMemory(); \
+ 			return -1; \
+ 		} \
+ 		_tcsncpy(buf, PyString_AS_STRING(v), cc); \
+ 		pLog->psz##struct_elem = buf; \
+ 		return 0; \
+ 	}
+ 
+ #define CHECK_SET_FILTER_LOG_LONG(struct_elem) \
+ 	if (strcmp(name, #struct_elem)==0) { \
+ 		if (!PyInt_Check(v)) { \
+ 			PyErr_Format(PyExc_TypeError, #struct_elem " must be an integer"); \
+ 			return -1; \
+ 		} \
+ 		pLog->dw##struct_elem = PyInt_AsLong(v); \
+ 		return 0; \
+ 	}
+ 
+ int PyFILTER_LOG::setattr(PyObject *self, char *name, PyObject *v)
+ {
+ 	HTTP_FILTER_CONTEXT *pFC;
+     ((PyFILTER_LOG *)self)->m_parent->GetFilterContext()->GetFilterData(&pFC, NULL, NULL);
+ 	HTTP_FILTER_LOG *pLog = ((PyFILTER_LOG *)self)->GetFilterLog();
+ 	if (!pLog || !pFC)
+ 		return NULL;
+ 	CHECK_SET_FILTER_LOG_STRING(ClientHostName)
+ 	CHECK_SET_FILTER_LOG_STRING(ClientUserName)
+ 	CHECK_SET_FILTER_LOG_STRING(ServerName)
+ 	CHECK_SET_FILTER_LOG_STRING(Operation)
+ 	CHECK_SET_FILTER_LOG_STRING(Target)
+ 	CHECK_SET_FILTER_LOG_STRING(Parameters)
+ 	CHECK_SET_FILTER_LOG_LONG(HttpStatus);
+ 	CHECK_SET_FILTER_LOG_LONG(Win32Status);
+ 	PyErr_Format(PyExc_AttributeError, "PyFILTER_LOG object has no attribute '%s'", name);
+ 	return -1;
+ }
+ 
+ void PyFILTER_LOG::deallocFunc(PyObject *ob)
+ {
+ 	delete (PyFILTER_LOG *)ob;
+ }