made this compile with the new abstracted socket server calls

undid some invalid changes during merge plus did a few wrappers.
Compiles, but does not yet work.

4 files changed, 8 insertions, 12 deletions

diff --git a/runtime/nsd.h b/runtime/nsd.h
index d6fa9e0d..044cc266 100644
--- a/runtime/nsd.h
+++ b/runtime/nsd.h
@@ -50,6 +50,11 @@ BEGINinterface(nsd) /* name must also be changed in ENDinterface macro! */
 	rsRetVal (*AcceptConnReq)(nsd_t *pThis, nsd_t **ppThis);
 	rsRetVal (*GetRemoteHName)(nsd_t *pThis, uchar **pszName);
 	rsRetVal (*GetRemoteIP)(nsd_t *pThis, uchar **pszIP);
+	rsRetVal (*GetSock)(nsd_t *pThis, int *pSock);
+	/* GetSock() returns an error if the driver does not use plain
+	 * OS sockets. This interface is primarily meant as an internal aid for
+	 * those drivers that utilize the nsd_ptcp to do some of their work.
+	 */
 ENDinterface(nsd)
 #define nsdCURR_IF_VERSION 1 /* increment whenever you change the interface structure! */
 
diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c
index 648b843e..604e4bcb 100644
--- a/runtime/nsd_gtls.c
+++ b/runtime/nsd_gtls.c
@@ -174,18 +174,11 @@ Abort(nsd_t *pNsd)
  * gerhards, 2008-03-17
  */
 static rsRetVal
-LstnInit(nsd_t *pNsd, uchar *pLstnPort)
+LstnInit(netstrms_t *pNS, void *pUsr, rsRetVal(*fAddLstn)(void*,netstrm_t*),
+	 uchar *pLstnPort, uchar *pLstnIP, int iSessMax)
 {
-	nsd_gtls_t *pThis = (nsd_gtls_t*) pNsd;
 	DEFiRet;
 
-	ISOBJ_TYPE_assert(pThis, nsd_gtls);
-	assert(pLstnPort != NULL);
-
-	if(pThis->iMode == 0) {
-		CHKiRet(nsd_ptcp.LstnInit(pThis->pTcp, pLstnPort));
-	}
-
 finalize_it:
 	RETiRet;
 }
diff --git a/runtime/nsd_ptcp.c b/runtime/nsd_ptcp.c
index 2b77787e..584cc93f 100644
--- a/runtime/nsd_ptcp.c
+++ b/runtime/nsd_ptcp.c
@@ -586,6 +586,7 @@ CODESTARTobjQueryInterface(nsd_ptcp)
 	pIf->Construct = (rsRetVal(*)(nsd_t**)) nsd_ptcpConstruct;
 	pIf->Destruct = (rsRetVal(*)(nsd_t**)) nsd_ptcpDestruct;
 	pIf->Abort = Abort;
+	pIf->GetSock = GetSock;
 	pIf->Rcv = Rcv;
 	pIf->Send = Send;
 	pIf->LstnInit = LstnInit;
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h
index f59c38bf..c20a61ea 100644
--- a/runtime/rsyslog.h
+++ b/runtime/rsyslog.h
@@ -69,13 +69,10 @@ typedef struct netstrm_s netstrm_t;
 typedef struct nssel_s nssel_t;
 typedef enum nsdsel_waitOp_e nsdsel_waitOp_t;
 typedef struct nsd_ptcp_s nsd_ptcp_t;
-<<<<<<< HEAD:runtime/rsyslog.h
 typedef struct nsd_gtls_s nsd_gtls_t;
 typedef struct nsd_gsspi_s nsd_gsspi_t;
 typedef struct nsd_nss_s nsd_nss_t;
-=======
 typedef struct nsdsel_ptcp_s nsdsel_ptcp_t;
->>>>>>> a7040a9623e228043209da897dbf30b9ab02d771:runtime/rsyslog.h
 typedef obj_t nsd_t;
 typedef obj_t nsdsel_t;
 typedef struct msg msg_t;