From e1ad02ec67f606decb012d9e6cbb0b27bfcd334b Mon Sep 17 00:00:00 2001 From: Brendan Date: Mon, 9 Feb 2015 11:13:34 -0700 Subject: [PATCH] removes unnecessary TCP stuff --- TCP/Makefile | 12 ---- TCP/TCPclient.class | Bin 1372 -> 0 bytes TCP/TCPclient.java | 68 ------------------- TCP/TCPclientExample.class | Bin 557 -> 0 bytes TCP/TCPclientExample.java | 11 --- TCP/TCPserver.cpp | 134 ------------------------------------- TCP/TCPserver.h | 42 ------------ TCP/TCPserver.o | Bin 3708 -> 0 bytes TCP/TCPserverExample | Bin 9556 -> 0 bytes TCP/TCPserverExample.cpp | 11 --- TCP/TCPserverExample.o | Bin 920 -> 0 bytes 11 files changed, 278 deletions(-) delete mode 100644 TCP/Makefile delete mode 100644 TCP/TCPclient.class delete mode 100644 TCP/TCPclient.java delete mode 100644 TCP/TCPclientExample.class delete mode 100644 TCP/TCPclientExample.java delete mode 100644 TCP/TCPserver.cpp delete mode 100644 TCP/TCPserver.h delete mode 100644 TCP/TCPserver.o delete mode 100755 TCP/TCPserverExample delete mode 100644 TCP/TCPserverExample.cpp delete mode 100644 TCP/TCPserverExample.o diff --git a/TCP/Makefile b/TCP/Makefile deleted file mode 100644 index c0db33b..0000000 --- a/TCP/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -all: TCPserver.o TCPserverExample - -HDRS = TCPserver.h -CXXFLAGS = -Wall - -TCPserver.o TCPserverExample.o: $(HDRS) - -TCPserverExample: TCPserver.o TCPserverExample.o - $(CXX) $^ -o $@ - -clean: - rm TCPserver.o TCPserverExample.o TCPserverExample diff --git a/TCP/TCPclient.class b/TCP/TCPclient.class deleted file mode 100644 index 0fc92ed3b857a40b862bec58e1f5fa689a2a3efd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1372 zcmZux=~5Fx80-PUZk9E21rZMxPY9BDU!X!T2+EmIR$=)kECa44yQyU2@hColf6)@C z(kdUohf;fX6Xmc{wKLn_(LFui=I5_(KLA|Es)YfJ#gRtF#8nH|aNWQS3o+b`<0NjG zxNYE$fx8;IXTidK3vrC=;Dm_>1|FJtWbtiM<5T*PH8HJMA~8&wcx)hNU`C+57PxPu z66l(LU3^>2_)=vGAvDh5dVOOvbZ6uI%mT3J@rtaZ#YUS75%MD zK~+6}YkY3xxj@@=uptGG&wIXHte4kib+x!&B66&titd|*VkLYJ6+NMN0kg{PI$fZ5 zc;skXftXtgY7DmyYX++j)T^$X@pRY3>h!W(@}#fQ`b0JckuorAV-8Pw%$ih+(wut5 ziH>gInT>fYP~jm5bg5(G6iy2aM#&D#S!(U;()6e=tUh9qz{zG{&ac!Josq?IWS@;i zENPZy{aCSa24`tY)UiP&&=b~&w&vcuvZB1er!l#Fekt#ajX7@M*HpFcs-S9P1SuPN z6l`3^ut0LQTrQ{6X~$E}yTHG!9Br+DQ?9|b!9NmyEc z&FlkEblC@?4>cvryq}=X+~nW!S>{+YEa2=!C!=NiU;(3|lS({e@;@V`?>n(2)jl%? zPBf>4z4ir2(cfrsD4@Ia{0l|bF|N^=Ht0h*Suf!5BO2gG*}@;kAl&hexVC~b!MMN> z-*(WBHm-%#9>f>4bhqxJE%hC-wb9diXy1XMK{Ep5Yu{n5rM|-0MaLfOJsjIXLMI$& z!Y6bt>V20^-bMFkQnVq996BlD97)pX;IoftKWqxr5{D@7J_TmE%TeGA#Vt}^o)zbr z-HVpr473`!VBn&FFmTCcXAVi@2(Q9J0)rHm*hSArbVR$}ZLvMC6(y-iY%>k$V#7{! zqbFP=Sp)O{Nb&Dzl#w(e*O27j*%{mjB^YcmMOyN4NE@s#8?2`yuD-~X6Q5v*l>MaC l1^@|iHVufFCSc$J@hL_gk#UkXWSdMYBr;hz%F-5G`2(4}CcFRu diff --git a/TCP/TCPclient.java b/TCP/TCPclient.java deleted file mode 100644 index c421b52..0000000 --- a/TCP/TCPclient.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * TCPclient.java - * Written by Brendan Haines - * Based on example from http://www.java-samples.com/showtutorial.php?tutorialid=1167 - */ - -import java.lang.*; -import java.io.*; -import java.net.*; - -class TCPclient { - /** Socket at the server */ - private Socket socket; - /** buffer to hold received info */ - private BufferedReader buffer; - - /** - * Connects to socket at server - * @param host - the server's IP - * @param port - the port number of the socket at the server - */ - public TCPclient( String host, int port ) { - try { - System.out.println( "setting up socket" ); - socket = new Socket( host, port ); - System.out.println( "socket set up\nsetting up buffer" ); - buffer = new BufferedReader( new InputStreamReader( socket.getInputStream() ) ); - System.out.println( "buffer set up" ); - } - catch( Exception e ) { - System.out.println( "ERROR -- constructor" ); - close(); - } - } - - /** - * reads one line from the receive buffer - * @return one line of the receive buffer on success, null on failure - */ - public String readLine() { - try{ - if( buffer.ready() ) { - return buffer.readLine(); - } - else { - return null; - } - } - catch( Exception e ) { - System.out.println( "Hmmm... it won't read" ); - return null; - } - } - - /** - * close connection - */ - public void close() { - try { - buffer.close(); - socket.close(); - } - catch( Exception e ) { - System.out.println( "SH*T! the connection won't close" ); - } - } -} - diff --git a/TCP/TCPclientExample.class b/TCP/TCPclientExample.class deleted file mode 100644 index bc608c8b2b6929011cf95287284312973781608e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 557 zcmZuu+e*Vg5Ix(b-Lyun(P+I?>%A(pC?blNm!cpPEu;wIQyN!^pj3lP!7x~Jd~p(cP0?;xO_vbGvmBpcv~*Fsv2Lx3Yx&m|Gip2j z^{y0V%^+^u;>eL?qfxEft|R>D@XqpDt|&{51`YiTneR&mZGC5>yuP(v-lQP!iyX5W z<}lBYGes1)ieYTqA`Gu$mt#T0B9=5P%R0I5I$tIP^;$b^-UvIA4gc-;ST_8FYu<;E z@Mr`>HngkdI zC@WB86jQ6uU=Nhg^yy4@L1d7_5ap7(52Yg>e?{V4PwL7uQng2 -#include -#include -#include -#include -#include -#include - -#include - -#include "TCPserver.h" - -TCPserver::TCPserver() -{} - -// Constructor sets everything up and starts monitoring thread -TCPserver::TCPserver( int port ) -{ - portNumber = port; - setupSocket(); -} - -// Destructor closes sockets -TCPserver::~TCPserver() -{ - close( connectionFD ); - close( socketFD ); -} - -// a unified/consistent way of reporting errors -void TCPserver::handleError( const char* message ) -{ - perror( message ); // print message to stderror - -} - -// Returns true on success, false on failure -bool TCPserver::setupSocket() -{ - // Create a new socket - // AF_INET: internet domain (not unix domain) - // SOCK_STREAM: stream (not datagram) - // 0: lets OS decide correct protocol (TCP) - socketFD = socket( AF_INET, SOCK_STREAM, 0 ); - if( socketFD < 0 ) // error setting up socket - { - handleError( "Error setting up socket\n" ); - return false; - } - - // fill server_addr with zeroes - // NOTE: memset sets arg2 bytes following arg0 to arg1 - // NOTE: sizeof returns the size of the passed type in bytes - memset( (char*) &server_addr, 0, sizeof( server_addr ) ); - - server_addr.sin_family = AF_INET; // just following the example (and its documentation) - server_addr.sin_port = htons( portNumber ); // assign the port number. NOTE: htons converts host byte order to network byte order - server_addr.sin_addr.s_addr = INADDR_ANY; // INADDR_ANY represents the IP address of the host - - // bind: binds the socket to an address - if( bind( socketFD, (struct sockaddr*) &server_addr, sizeof( server_addr ) ) < 0 ) - { - handleError( "Error binding socket" ); - return false; - } - - // listen for connections to socket (max 5 waiting) - listen( socketFD, 5 ); - - clientAddrLen = sizeof( client_addr ); - - // wait for client to connect - printf( "Waiting for client to connect\n" ); - connectionFD = accept( socketFD, (struct sockaddr*) &client_addr, &clientAddrLen ); - if( connectionFD < 0 ) - { - handleError( "Error on accept" ); - return false; - } - - // empty buffer - memset( buffer, 0, sizeof( buffer ) ); - - return true; // setup successful -} - -// returns a pointer to the buffer -char* TCPserver::getBuffer() -{ - return buffer; -} - -// returns the connection file descriptor -int TCPserver::getConnectionFD() -{ - return connectionFD; -} -/* -void TCPserver::startMonitoringThread() -{ - // create thread: ( thread, NULL = default values, function to run, parameter (void*) or NULL ) - if( pthread_create( &monitorThread, NULL, monitoringThread, (void*) this ) ) - { - // error creating thread - handleError( "Error creating thread" ); - return; - } -} - -void* TCPserver::monitoringThread( void* serverPointer ) -{ - int n; // contains the number of characters read - - TCPserver server; - - while( true ) - { - // read from the socket and put in the buffer - n = read( server.getConnectionFD(), server.getBuffer(), 255 ); - if( n < 0 ) - { - server.handleError( "Error reading -- monitorThread " ); - pthread_exit( NULL ); // exit this thread - } - } -} -*/ - diff --git a/TCP/TCPserver.h b/TCP/TCPserver.h deleted file mode 100644 index ab85d61..0000000 --- a/TCP/TCPserver.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -* TCPserver.h -* Written by Brendan Haines -* Based heavily on example code found at http://www.linuxhowtos.org/C_C++/socket.htm -*/ - -#ifndef TCP_SERVER_H -#define TCP_SERVER_H - -#include - - -class TCPserver { -public: - TCPserver(); - TCPserver( int port ); // Constructor - ~TCPserver(); // Destructor - - void handleError( const char* message ); - - char* getBuffer(); - int getConnectionFD(); - - char buffer[ 256 ]; // buffer to store read data -private: - int socketFD; // file descriptor for the socket - int connectionFD; // file descriptor for the connection - int portNumber; // port number of the socket - socklen_t clientAddrLen; // stores the length of the client's address - - struct sockaddr_in server_addr; // contains the server's address - struct sockaddr_in client_addr; // contains the client's address - - //pthread_t monitorThread; // thread to monitor the socket and read to buffer - - bool setupSocket(); - - //void startMonitoringThread(); - //void* monitoringThread( void* ); -}; - -#endif diff --git a/TCP/TCPserver.o b/TCP/TCPserver.o deleted file mode 100644 index 956e754cbe8584736491894f3114bfa1f50e0444..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3708 zcmb7HQD_`h6n%+lyQ#Ii)hHE>nQEY-Y{^DjXt9_y8JS|D)wHyVVX|&#o5f^z*_~~J z5ZtAuW?WMui1;P_kXEE0{n4aBLSiKO5i9s3e&wU;3RPAbq^**A?t6FAWM&fRC9`+$ zJ?Gwc-+gc1+g!c<=h7x2YVH&Gz(cx9UohwO|z?W8N`<%uB(rGF@k*L>aQ2#enniB(lo7pGntDIS_<^m z_cJ%^Jqi0ncN2(7Jn;BZl*< z;SAsGolSuIc)7PS6% z*H;xFcR^Chu5i;CSpn}C&D}5M_o+5m)#WAVuBzEN`gNJd!79lS!%c1XwBHP;AUDm5 zYQ|{%q;oUr=u6@8;iZ}1L*eo6rI}ly`m1n<$EPtd$m)9K-qvZ)%lOr`_s;6MTqdXG zE!)OF#NIuOU9XMft@uO8f9W#=lgE4|mV+9c#q5@#*%$8hDZMwdy<1 zIBi3SZ~SS->1+$atBh}519uNkI{P5L{OlJs@4hZ-h9WhQEt^7PU^RpMIG)hIccgIt z@yc(FoUQG6fUh^n!*M98w-t})8OR#|ufjZDk3inXEAsKW1oFNCZ|FZYF0W4@?;3bT z=J7fO^5`J>lzHpT<9YDLn8)iDnC~s{MwrLz7sxxaA|J0~Any`*?tI;K^RCBN*bkZz z(T|{UCqy&QjnKWUcS1h|dl9)%dz9{3+>OzB=sHj@Kx6LF_n>z`pMb{w+t>&F1ndrI z;_ri|luturpG5ybkMTA73pC}u3{AX?(2&Nn_;?a_H#Dy5=nm+Iq1zCIzl|DeGRR&4 zPI{X4dDcbNeXQG9YpkJU+#VFS6_5LSXFu6U=)O;{F&@R_NZw%k0NZi4<7}tMMuXhn zCwaD8_(kYLjxh4O?=$r^41S35eT);2WRUTG{{2-?HXiqV-G=-WU*!0|01@uK?>9L9 z7~>Zhch9SHjE`}C+AkFEo|o;6Z)bcbArBd${9J-pZY{ zaviPuNv|vBceUy%4=WbKeOSo$$eWM?`1V_!J{Iebr;iU<@}kray_^u{pf!j{VbZNB z%z;$iw$j4P;-|cw6eeGatFv^(e8YFjx)TGLyyYpZQ)drw&QfkHBA<$N=Y z?FQDN?&wq|{ZgloL7m!V^?OpHv>-3~<>z`@<|oiR{a%`CfH!bpU%&l&-QjCCvP=Y(#ke}7tnq9~^j{{x?=)CK?m diff --git a/TCP/TCPserverExample b/TCP/TCPserverExample deleted file mode 100755 index 772cdf6ca734665aed75540d4d6456a96769afa5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9556 zcmeHNZ)_Y#6`yr%;s!T&2~BHSsw|;Ffk=tZYJ($G)lR%{rg3X(M{R?w)%m<5UMH!C;~oFB#ablry@~8BF93gjViuW{iBFKWh151A&PK=u=)LF zXYJc{3=$vsv`;rP@Au}-n>TM}=k{jqjoTlrY!yP=B1E}K2(bgH)*{3ip@S3RlSpwS z(;VpevT?$A>Pbrdr1{|;5$)_l2c|h>JTv51k?o^?nNS$M3AiIZrm9V|XiXQ_b%XZm z+b|eZe;WfL5jVT6n>UMcBQ(uIu{2Ux69w&+x4ZTZDGd*M4O*4Gb^mD39Jex)Rvt=0 zdkf0mbIJfQ9M{i9yfaXyk|@g#0{7<#D@w*J2I{k z39$!L-a%e>$I^?gnIO}+h(fBmrI zA;=IqOeQvhZQI1>Jxm#BAI8geQFhQk?1yn+oxA?0!D;J#qyOao{Rd(P;6!>v`qkyr zzkqGWuRnOYP_!lv98pc6EyQP$=-(y8kLBkSz79;1KjxwY$0$~Kg2!s*%-y(24 zZvQ!M&nypLNkw+|3L)|Hx1yBAt24{a+pDXq@#n8bhp%j?w@V*VrCR#Xo^REJaPTf8 zUNrvZs{8Ee3;fc!2qp0v9fkQi+SXAz_BH1azRKg(e#frhD?(JxGbcr6<@fmPBQHpW z8OOPWnnhz(+39>H#1 z3r;V+n0@r`(wTneTBQxzbl5ijG$))dD0x*5IbOM}qdHza?!+sQM>VJ zhOly;Icd$AbJ7mt^E*hTGrPg4_;}Hj@j+x>MQiA2-!fJo(ju>3!hGp>n*a6rby`-u zRgjW&AhP?Lbii9Ly0>1cFVHtmFFNWWTkWsAqqB`$&Ou0Q%#!Revb)=BzrNmH*?hgl z?UGzH&OgzyyU1!>uPJ*uWg9Dz`I(i=e`$@(_pe<3sP(QlAdbvm!oWa&f92XXxaMVh zzwg6WY7Hcxhsv!1j%4=C62fqP>u))#U4M{++ZnfyFWVQcGCuaN7G!bFe%(1oZuSBj zIPDx#wdI$xfrx+6SdN_G>(v4S7_VHV@!=~Da#35|`(2c)d%q|1mt_93%)c-5AISVi zGCwQxA0x*aoqezmOwZuz-oq$s;}qU}A3cxrmF?y`QM}R*c}s6f0b*csh}mdMUI? zX3|!+s26j3GMCL-$+b4Qte!|Ftx5c#;9x$5L~1OtzU6P%hfy-|cPEKF9z?uvYIv+< zC@9wMVGh#1{*=(Bqgu3WYikYFo5@}6&GRMnN9%8@@*P#augbbAZ>zFd{m$F2%63(5 z-a}XuMj(tp7=bVXVFbbmgb@fM5Jn)3Kp25A0$~Kg2>ibyuwzgAv+QeUx5=yUMDnDW z96xD}l@j?;@zs2^*3C;cc}Z^ar~{YUWe2AslC+x0w+C9L66uV9T!&m8ascfEVsqAX zfKO&}1&g2yAd|+uSeB?8Xu_JnVGB_l2)F1sejyql!cBNFMf41iI&!JWSZOByC(vYy z9TSOkR(zm|ripRWnzoXqqJ``D1U-NF#1n^yjt&&8{1i|Z&saqBQ85@3GreL_J3M9; zkCaj=D{oARKf*$%A%B@d5`fya~LJs7%9L*@Hns1rKB*J8-u zf_(0N$m`5%4xcy!mPh?pwhli51c2Gp&cAz<2 z#8L?7MFdPuVgAp7cmS8QtRGUiuIi^0zM=4U6z0V)^?&MN)qY-KU16LhO8egbG~QKs zQnjxu+@bIm7>#J|i8t-vCoztc)w$Dy!1%0<2w)6L@Y;YQ;(u*+B7Fjh=XAXH=6u|T1nR~R<$d{o)7SBDf)mGLo#vB+gQpUc zec58{P?55R)gFrl*IlsQzfJ?ScUaqg4d1iluR0nt(gANEnhJ_KH)`==@Z0L$*s#~t r+W54aawqU@YjSh)N!*Rj+o{|=O6^YGzU1vl-d^PGLf-zfVT1fP4fb~` diff --git a/TCP/TCPserverExample.cpp b/TCP/TCPserverExample.cpp deleted file mode 100644 index ad8d702..0000000 --- a/TCP/TCPserverExample.cpp +++ /dev/null @@ -1,11 +0,0 @@ -/* -* TCPserverExample.cpp -*/ - -#include "stdio.h" -#include "TCPserver.h" - -int main( int argc, char* argv[] ) -{ - TCPserver serv( 51719 ); -} \ No newline at end of file diff --git a/TCP/TCPserverExample.o b/TCP/TCPserverExample.o deleted file mode 100644 index fc8ba319a35c25882325db87c065a2b15ba347d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 920 zcmb7CO-mb56un7pQqaaA3bnX!(QQhyvlJnc3_NI&K_V1Oc?@yVgfvl-sKJ#k6owGU zPw29LppY&CfYor?w0r5o^qiSDm;}1$fjj4ZoOkEWyL0vD_kCO>@<{N2kw4Q} zh5?JP6~_O-waK3uO&Fu6(AbaAy5+W8fgi*L>s{d?4!s@Yu-_E?UR2~Ub5n9e3ZZpz zr?%@9TY9g4P^oWg{Wc%g$h#(3Hk?Ku&e8{)QQlta*uxXRtFkyoWSiP62dc!wAknqn5Mrd;b@k%DYj=zijkT-IE{p!{N91CH&3; zJE_i`@;2|h!37G+``Y*EyZ7_fuXYDK5cnPcmQ_d8YwK?IBmqI+7ad=)`G<2~#*7cM zCyqacc@sqrHzd+dMv^n}Cq1ZMAio5&hXKMp%UU9N8qGb8nR8VzCP}>kBe%+>;$BiK zVBAsaxygfgcd_^21PbAPIMD3KR2z&@{{kj>exxj^i8wnEb9bY9(KV-1$M3A0EvH!3 z#d1}D+;bY+NNugZD&*{@+t_y-xr|krNaZuu{`kR?Q~4A$eCd|OQo#?H#w+D7u}*+B