--- projects/cms/source/host/c++/SmallNet.cpp	2001/02/26 14:55:51	1.3
+++ projects/cms/source/host/c++/SmallNet.cpp	2001/03/05 12:39:43	1.4
@@ -20,48 +20,36 @@ int SmallNet::connectHeartBeat(string host, int port){
 		std::cout << "SmallNet::connectHeartBeat(" << host << "," << port << ")\n";
 	}
 	
-	socket = new iosockinet(sockbuf::sock_stream);
-	// create a pointer to the object
+	ssocket = new SubNet(host, port);
 	
-	// connect the socket
+	return ssocket->isConnected();
 	
-	// std::cout << socket;
-	
-	return (*socket).rdbuf()->connect(host.c_str(), port);
-	
 } // connectHeartBeat
 
 string SmallNet::heartBeatSend(string text){
 	
-	char  buf[1024];
 	
-	if ( debug == 1 ){
-		std::cout << "SmallNet::heartBeatSend()\n";
-	}
 	
-	// std::cout << socket;
-	// (*socket) << "BUNG BUNG BUNG" << flush;
-	(*socket) << text.c_str() << "\n" << flush; // 
+	// char  buf[1024];
 	
 	if ( debug == 1 ){
-		std::cout << "SmallNet::heartBeatSend->Sent:" << text << "\n";
+		std::cout << "SmallNet::heartBeatSend()\n";
 	}
 	
+	return ssocket->sendTCP(text);
 	
-	(*socket).getline (buf, 1024);
-	
-	return buf;
-	
+
 } // heartBeatSend
 
 
 void SmallNet::closeHeartBeatConnection(){
 	if ( debug == 1 ){
 		std::cout << "SmallNet::closeHeartBeatConnection()\n";
+		std::cout << "Deleting socket\n";
 	}
 	
 	// closes automatically
-	// socket.close();
+	delete ssocket; 
 	return;
 	
 } // closeHeartBeatConnection   
@@ -100,15 +88,33 @@ void SmallNet::sendUPDPacket( string host, int port, s
 	
 	if ( debug == 1 ){
 		std::cout << "SmallNet::sendUPDPacket:" << host << ":" << port << "\n";
-		std::cout << message << "\n";
+		// std::cout << message << "\n";
 	}
 	
-    	osockinet udpSocket(sockbuf::sock_dgram);
-    	int udpSize;
-    	udpSize = 8192;
-    	udpSocket->setopt(sockbuf::so_sndbuf , &udpSize, sizeof(udpSize), sockbuf::sol_socket);
-    	udpSocket->connect (host.c_str(), port);
-    	udpSocket << message.c_str() << endl;
+	// hard coding for testing
+	/*
+	host = "raptor.ukc.ac.uk";
+	port = 7776;
+    	*/
+    	
+    	ssocket = new SubNet();
+    	ssocket->sendUPDPacket(host, port, message);
+    	delete ssocket;
     
 	return;	
+}
+
+string SmallNet::getHostName(){
+	
+	ssocket = new SubNet();
+	string name = ssocket->getHostName();
+	delete ssocket;
+	return name;
+} 
+
+string SmallNet::getHostIP(){
+	
+	// (*socket).rdbuf()->bind();
+	// return (*socket)->localaddr();
+	return "";
 }
\ No newline at end of file