From: Vlad S. <ser...@us...> - 2005-08-01 18:56:20
|
Update of /cvsroot/naviserver/modules/nsdns In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31262 Modified Files: ChangeLog nsdns.c Log Message: removed old compat functions Index: nsdns.c =================================================================== RCS file: /cvsroot/naviserver/modules/nsdns/nsdns.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** nsdns.c 24 Jun 2005 00:37:39 -0000 1.15 --- nsdns.c 1 Aug 2005 18:55:59 -0000 1.16 *************** *** 164,175 **** // DNS proxy thread if(!Ns_ConfigGetInt(path,"proxyport",&dnsProxyPort)) dnsProxyPort = 53; ! if((dnsProxyHost = Ns_ConfigGet(path,"proxyhost")) && ! (Ns_GetSockAddr(&dnsProxyAddr,dnsProxyHost,dnsProxyPort) != NS_OK || ! (dnsProxySock = socket(AF_INET,SOCK_DGRAM,0)) == -1 || ! Ns_BeginDetachedThread(DnsProxyThread,0) != NS_OK)) { ! close(dnsUdpSock); ! close(dnsTcpSock); ! Ns_Log(Error,"nsdns: create proxy thread %s:%d: %s",dnsProxyHost,dnsProxyPort,strerror(errno)); ! return NS_ERROR; } if(dnsRcvBuf) { --- 164,176 ---- // DNS proxy thread if(!Ns_ConfigGetInt(path,"proxyport",&dnsProxyPort)) dnsProxyPort = 53; ! if((dnsProxyHost = Ns_ConfigGet(path,"proxyhost"))) { ! if(Ns_GetSockAddr(&dnsProxyAddr,dnsProxyHost,dnsProxyPort) != NS_OK || ! (dnsProxySock = socket(AF_INET,SOCK_DGRAM,0)) == -1) { ! close(dnsUdpSock); ! close(dnsTcpSock); ! Ns_Log(Error,"nsdns: create proxy thread %s:%d: %s",dnsProxyHost,dnsProxyPort,strerror(errno)); ! return NS_ERROR; ! } ! Ns_ThreadCreate(DnsProxyThread,0,0,0); } if(dnsRcvBuf) { *************** *** 186,199 **** dnsQueues[n].freelist = req; } ! if(Ns_BeginDetachedThread(DnsQueueRequestThread,&dnsQueues[n]) != NS_OK) { ! Ns_Log(Error,"nsdns: queue thread failed: %s",strerror(errno)); ! return NS_ERROR; ! } } // Start listen thread ! if(Ns_BeginDetachedThread(DnsQueueListenThread,0) != NS_OK) { ! Ns_Log(Error,"nsdns: main thread failed: %s",strerror(errno)); ! return NS_ERROR; ! } } if(dnsDebug) { --- 187,194 ---- dnsQueues[n].freelist = req; } ! Ns_ThreadCreate(DnsQueueRequestThread,&dnsQueues[n],0,0); } // Start listen thread ! Ns_ThreadCreate(DnsQueueListenThread,0,0,0); } if(dnsDebug) { *************** *** 662,669 **** if((arg.sock = Ns_SockAccept(sock,(struct sockaddr*)&arg.saddr,&saddr_len)) == INVALID_SOCKET) break; if(dnsDebug > 3) Ns_Log(Error,"DnsTcpListen: connection from %s",ns_inet_ntoa(arg.saddr.sin_addr)); ! if(Ns_BeginDetachedThread(DnsTcpThread,(void *)&arg) != NS_OK) { ! Ns_Log(Error,"nsdns: Ns_BeginThread() failed with %s.",strerror(errno)); ! close(arg.sock); ! } return NS_TRUE; } --- 657,661 ---- if((arg.sock = Ns_SockAccept(sock,(struct sockaddr*)&arg.saddr,&saddr_len)) == INVALID_SOCKET) break; if(dnsDebug > 3) Ns_Log(Error,"DnsTcpListen: connection from %s",ns_inet_ntoa(arg.saddr.sin_addr)); ! Ns_ThreadCreate(DnsTcpThread,(void *)&arg,0,0); return NS_TRUE; } Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/modules/nsdns/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ChangeLog 27 Jun 2005 00:01:22 -0000 1.6 --- ChangeLog 1 Aug 2005 18:55:59 -0000 1.7 *************** *** 1,2 **** --- 1,6 ---- + 2005-08-01 Vlad Seryakov vl...@cr... + + * removed all compat functions + 2005-06-26 Vlad Seryakov vl...@cr... |