From 930797e073bfda161b6319de2e4b1ec78597ce9a Mon Sep 17 00:00:00 2001 From: Jonathan Roemer Date: Sun, 8 Feb 2015 10:55:48 -0500 Subject: [PATCH] Some changes to networking. --- bin/networking/networking.class | Bin 2605 -> 2975 bytes src/networking/networking.java | 26 +++++++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/bin/networking/networking.class b/bin/networking/networking.class index ee8b8b60eb9304c822c3e5a821f3f79f7e7d84bc..9cdd2608fa62bc6131d099d212fbfdf7be73e70a 100644 GIT binary patch literal 2975 zcmcIlYf}?f7=AVc7Q(6sqDB;Ht;j`1Tf8Myte`c@O_Bl;FI_eVSP8pvvqA0s`cFFJ z=e9H8l(v5FkLfRPN}sd4Nj9-FI-NF|$?iGt{du4F%^!dL@;iWGe6J#+pwklWW7}CX zt(BqbtBRxG%=*^B}urC`^XZ53VJ za_97XNi+am3ko`l!pgm(UiLFCil!rSWk1p;8`#u|cpJnXH;ab7A)Fc8acR)4GgBF) za?gb1{gQ&_qHw60no-a`QLQHJIxIJ-Kyz1xvu-nKSL!s675L z=XA%E=kn#N$SR0kdt!)!YZ6x##|c5ThKfYR33kyFuzy2oui~_AtO+-UUi8Zx2Utp9 zs((&ioYZg%rC3NZ_yAYgUuKz;?NG3<9MhwBK!_N|ab3kV1$({JJz2_f#foq= ze25!#QP7>D;2kj!qJ=&5r&@3m6Dn@iQs!yV73&%%F-2%P$=WU9u+P4;dX}=g zO+}9B_qGm-90NikBumoacHA8Fqnpe6T602bF#+SQG^1Q( z1>E9jMjVZ3;z{Kx;+1mw!U4eLDIZ8nO*Xp5u0U z6Cce#gO-R=cQGD)As^3neoZve(fxSi3kGe&Reph1%<>Cj*~8xicJucrZ;w%8Fi0I+j@4F&u`09ODiW zJHY}QuuP3!L|>v+Meh#IBf_UjLMtj(ns;Omc;TH0mHB$82>+Ww_3*!g>Kx0x$U>6@ zBf&C9Sm66C`!b;#B~(`k)hMC5K&ZwD)i|NL_CG_F$9g@h@Bif=g&lxSCTYro5oBfTYYkLdn0y}x04)(DRg6k(iv8Ln-rO? zRK+M>i)qL=IXu!+H$Ep7BD8Fz{TBfNG(=uPW7jimI@|o^8|2PD|I6Ixna3Swu*ht( z%=aF1zt7ws)a3q^H-9pBIq+|u``4AFATg64rMdv*h5})cBDpbI@XhPh&5F8$Z#~2B F{sxc$jJ*H= literal 2605 zcmcIkYf}?f7=BI&EW#>xZv-}?a^ zY3uj?nEnE%^f|j5a-lPIoR-Xxob%qE_j#Z9{PEYj-vLY@uOT4NW=ZEw#@;uro$=yN z4MBm%J>$?APaCu>Z|%vXBXHH0NogL+*}QE_%ZbZ_?8@?LTtGwxF3)DHoMTwdnvu@S zDxhmapd}}*)CKoKo;jH_ZJ8?MQ85WWrotr9e6hAb)!@*YK;4rclQQd=tgoSo35v+i zEds&WOiF5KWz(*m?T*K!eJJf%Cb=)2I<(-bj%#QasF^k`(|O3C!RXMMvUKX`LN_f& zQq^LS!J&m>9ydcoLoZ2kZ_Uj3On!S?vb|Mlq@=AOB+yZ?MXhY!i8;134m@)m`f*dk z4S|M=tU5l!fWVa<>6AnXTq^)zsS-n^4%acL`WO;uAM`L*xTuzTFru7pt4_|HJS-8< zKBi+FcLZvQGPPh@QlPa^)0GABQ#UMl4-*>h3pBaVU0c+0DvWA_Lyd(L3 zwbBej(M$LOVGR$;WEcA>=g0#c5lnN`nY@ZVhq}VrK7)~3a8zCKT^UMx$_z0sD{aHc z+cIS4!V2PJ9baKaKs!|WT;ArSI9xAZDP;CDhj|T83PK`zCB<|+#WU(4tLih!^gr~o zS(4S;orqtkJQqv#U{{qi1v-nnQ|9wpAv3VA zBdy*O%~ea<640GpX&+?xP&&~SHPs?%eoty(d^FWeE7b0x=0sd}N(f~hpUJWr)x|P- zJ1OT)rJsi4^FF3(*6`H^Ut9#yfojz7r12C$Ezg%K&UGc{dfN4}bCCX*afPuBZaywC zngP*5uNvNLo}wku)U|Pfwim<4=vX*KPvR8U6C=myJHf3J3@_e3#^_tzefSGLZ~ij) z8>$jjJ#XGecZhemeJ10n~3wN-M|2r7&%O0>ajxG3QvuUc}X9^ z9Nmb~Gr&x(c*O>*uttvo1V5l&L(3Va5a74Ql0w6J?U^Er7w(BvCH|eN#K%(g`oE)U zgzb*8(YwTbhi%?tgZJ6?1gV-NRa2yDl5~uch6f}dOsXRPGgV*Xn@UyTXAY)X4d@j8 zi4j*;-!7iQNKit_;0bn?MmvwOcXak=ILIp{8jelpsQVb@iKExm`eWYCQXX@Z#0;(T z?D{EgvDbnClnm5})!#4;*q4btM(lB7e^rLv{v_-IIrbZX^EVNWO?&_V diff --git a/src/networking/networking.java b/src/networking/networking.java index bbec9a9..63a12d7 100644 --- 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() { + + } + } \ No newline at end of file