Some changes to networking.

pid1 · Feb 8, 2015 · 930797e · 930797e
1 parent ae1494e
commit 930797e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/bin/networking/networking.class b/bin/networking/networking.class
diff --git a/src/networking/networking.java b/src/networking/networking.java
@@ -16,6 +16,16 @@ public interface networking {
     // Send the desired temperature on port 7001
     static final int sendDesiredTempPORT = 7001;
 
+    // Discover protocol receiving port
+    static final int receiveDiscoverPort=7777;
+    // Discover protocol sending port
+    static final int sendDiscoverPORT=7778;
+
+    // Server IP object
+    String serverIP = new String();
+    // Thermostat IP object
+    String thermostatIP = new String();
+
     // Listens on receiveCurrentTempPORT and outputs the received string to console.
     public static void receiveCurrentTemp() throws Exception {
         ServerSocket listener = new ServerSocket(receiveCurrentTempPORT);
@@ -60,8 +70,8 @@ public static void receiveDesiredTemp() throws Exception {
     }
 
     // Sends the current temperature on port sendCurrentTempPORT. 
-    public static void sendCurrentTemp(int currentTemperature, String thermostatIP) throws Exception {
-    	Socket sender = new Socket(thermostatIP, sendCurrentTempPORT);
+    public static void sendCurrentTemp(int currentTemperature, String serverIP) throws Exception {
+    	Socket sender = new Socket(serverIP, sendCurrentTempPORT);
     	try {
     		while (true) {
     	    	PrintWriter out = new PrintWriter(sender.getOutputStream(), true);
@@ -72,7 +82,7 @@ public static void sendCurrentTemp(int currentTemperature, String thermostatIP)
     	}
     }
 
-    // Sends the desired temperature on port sendCurrentTempPORT. 
+    // Sends the desired temperature on port sendDesiredTempPORT. 
     public static void sendDesiredTemp(int desiredTemperature, String thermostatIP) throws Exception {
     	Socket sender = new Socket(thermostatIP, sendDesiredTempPORT);
     	try {
@@ -84,4 +94,14 @@ public static void sendDesiredTemp(int desiredTemperature, String thermostatIP)
     		sender.close();
     	}
     }
+
+    // This discover protocol finds other instances of Thermocontroller running on the network, and updates the IP addresses accordingly for the server and the thermostat
+    public static void getServerIP() {
+
+    }
+
+    public static void getThermostatIP() {
+
+    }
+
 }