From b16f846ade488ef74e388664dafd77424cdfe23b Mon Sep 17 00:00:00 2001 From: Andrew Gundersen Date: Wed, 20 Jan 2021 14:42:29 -0600 Subject: [PATCH] server updates --- server/__pycache__/packages.cpython-38.pyc | Bin 0 -> 1456 bytes server/server.py | 26 +++++++++------------ 2 files changed, 11 insertions(+), 15 deletions(-) create mode 100644 server/__pycache__/packages.cpython-38.pyc diff --git a/server/__pycache__/packages.cpython-38.pyc b/server/__pycache__/packages.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d3eb7ce877dc14689864ade5ae923d6316047941 GIT binary patch literal 1456 zcmZ8h&2Aev5a!>mR|D{wfRA*q>fzTva=^#*}&?Z5c9e)z) z_74yxSrJDs>4G^{vL&_m9anToDN(FTO12V;qZhR3l7u-{0xZ1bD%vIs;cB48+hj=> zQ7K$fk}_H{Rr`xA;*y$IWvr5IqUu9tUb#A~8n_qdJyOOH=h}slN4j?|b2--5=6x;m zLP?|D%oNhir`1~JF5i_;pUYlxZk!xgd2D9E)sXOoePDc$&(wp5aylE0ZmzJ>nY^$) zGdR^sf_pI8l^2_xpXI^+@xDB2KW;z$rG0SdqullegKN5T1;CIi3L<4*;LTp(-E1+XA6aJxQ<$csf%6<) zH9VV-Mp@%FzO?3JJLwIz%c78H))?FV$(hcTHkF<`XHIRFpdCZ2tnin8cjjx;yf*{{ z-xBi)M0ou}>zUQYwsO^<6>x>sMeAVFn~inhYzrV6Ls~n1H{8jm(-v$!*QRxIhuxjd zy+9x_ZF>&{;SHA1gbLmOiKEFknV?O&$;_wVze6@4Gr^;QY`=n{=!%q7u|B(`D_Rjt zi4{?iV~!*JmK1#ppdjqz)y_b**oimfZ}vvqoD)D?pj*j4CznXp8W1VD_)>N?Q0JCN zljp#tc_7EG^yHcngY95Ah>W|J?wam((%6gNCxgPrx(LPMP%MK@Y3d-n0Mt|(nUBzd zh0mJRMs9dknmM;JT1j#;BB=juk2+9ip4Nr8*TiQt@Uq78Yog0(StK<^6 z8FGHaP9K1p^11femo;A1M_*QCLBCnW?NM@UJ6 z0#Cy|e0<9A_>_>EB7ZV?Q0NPI5Kr?*{+bxogKp+ij vz6Pz6(nBa8)-sSZ03JdN?)UP-o-v_V$=-OPW+VMQ25k{3;QV&7mel_Te$!Ro literal 0 HcmV?d00001 diff --git a/server/server.py b/server/server.py index 784d081..07da3ec 100644 --- a/server/server.py +++ b/server/server.py @@ -26,23 +26,19 @@ client_socket, client_address = server_socket.accept() print(f"Accepted new connection from {client_address}") while True: + + print("Listening for packages.") package = pull(client_socket) - if package: + # On-connect package + if package['type'] == 'con': - # On-connect package - if package['type'] == 'con': + # Gather user ID + user_id = int(package['data'].decode('ascii')) + print(f"Received user ID: {user_id}") - # Gather user ID - user_id = int(package['data'].decode('ascii')) - print(f"Received user ID: {user_id}") + # Send greeting + push(client_socket, "Hello from the Server!") - # Send greeting - push(client_socket, "Hello from the Server!") - - else: - push(client_socket, "Received audio!") - - # Send a "ping" to client to prove connection. - push(client_socket, "Connection still alive!") - time.sleep(2) \ No newline at end of file + else: + push(client_socket, "Received audio!") \ No newline at end of file