From aa84d1c45cd7e2cba1e873702b1f27677257090d Mon Sep 17 00:00:00 2001
From: Katharina <katharina.willig@outlook.com>
Date: Tue, 19 Nov 2024 22:35:34 +0100
Subject: [PATCH] debug whatever+listener
---
Server_A.py | 13 ++++++-----
Server_B.py | 9 ++++----
__pycache__/dynamic.cpython-313.pyc | Bin 0 -> 3104 bytes
__pycache__/leaderServer.cpython-313.pyc | Bin 0 -> 961 bytes
dynamic.py | 27 ++++++++++++++++-------
leaderServer.py | 4 ++--
6 files changed, 33 insertions(+), 20 deletions(-)
create mode 100644 __pycache__/dynamic.cpython-313.pyc
create mode 100644 __pycache__/leaderServer.cpython-313.pyc
diff --git a/Server_A.py b/Server_A.py
index 11ae53c..577ca45 100644
--- a/Server_A.py
+++ b/Server_A.py
@@ -24,16 +24,17 @@ server_id = str(uuid.uuid4())
#print(hostIP)
dynamic.broadcast_sender(leaderServer.broadcast_ip, leaderServer.broadcast_port, server_adress, server_id)
-
+print(f"send broadcast of server a id: {server_id}")#debug
while True:
- print(leaderServer.leader)
- print(leaderServer.server_network)
+ print(f"server a before broadcast sender: {leaderServer.leader}")
+ print(f"server a before broadcast sender: {leaderServer.server_network}")
data = dynamic.broadcast_listener(leaderServer.broadcast_ip, leaderServer.broadcast_port)
- print(leaderServer.server_network)
+ #data = leaderServer.leader
+ print(f"after broadcast sender: {leaderServer.server_network}")
if data:
- x = data
- print(x)
+ #x = data
+ print(data)
# if d in leaderServer.leader:
# leaderServer.server_network = leaderServer.addServer(data)
# dynamic.broadcast_sender(leaderServer.broadcast_ip, leaderServer.broadcast_port, leaderServer.server_network)
diff --git a/Server_B.py b/Server_B.py
index cf68135..7c40ea3 100644
--- a/Server_B.py
+++ b/Server_B.py
@@ -19,12 +19,13 @@ server_id = str(uuid.uuid4())
hostName = socket.gethostname()
# IP des Rechners im Subnetz
hostIP = socket.gethostbyname(hostName)
-print(leaderServer.leader)
-print(leaderServer.server_network)
+print(f"server b before broadcast sender: {leaderServer.leader}")
+print(f"server b before broadcast sender: {leaderServer.server_network}")
dynamic.broadcast_sender(leaderServer.broadcast_ip, leaderServer.broadcast_port, server_adress, server_id)
-
+print(f"send broadcast of server b id: {server_id}")#debug
while True:
server_network = dynamic.broadcast_listener(leaderServer.broadcast_ip, leaderServer.broadcast_port)
- print(server_network)
+ print(f"server in network: {leaderServer.server_network}")
+ print(f"leader in network: {leaderServer.leader}")
diff --git a/__pycache__/dynamic.cpython-313.pyc b/__pycache__/dynamic.cpython-313.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1c33a1d9ccfbfdd830d9f1d250def00837c5e3af
GIT binary patch
literal 3104
zcmey&%ge>Uz`(GU**5(J7X!m%5C?{tpp4H33=9lY8G;#t8NC_27>gJcKx`&&rXr?b
zhF~Ud<|5``<|3A07Ab}z)?ijCh9b6fCQY`NAnlrrx7bqilJiqi{W2K@7#NaSK%!90
z%D}+D%)r3#Ife;jK{QmDfguRaLNJsVkmO-bLr5dbBHIB~VG7le#}dlK#}LdI%FM@L
z%$&y>%??$-5X}K&1%ZPE#)HtNj1W4Q$tr?@A+etUSv?O#4w+P92xW%pQ9xG9hpY<1
zR$>TcLQ*RT5oKTqX2$O(J_cjL`h;MnA!t;6p)5h72ss!lS{%j-WrevdND?N7piQC7
z2u2eoSQslXq%+XM)M!M=uposDK_8|wXtMhKVzRO-0wsc9%pREvRjjEw#i<IKytmkj
z^OLhvOK!0{y2X3?xrW^03ifyQj(2ena`e5$oRgY&izg>FF(tJqIJKxOwdfWbgm;TG
zF(t(ZECFUhWmyY~GV@Aq@fCv=$LFP%l;;;^-(o9H%}XiCzr|c!Qd9&=@tSP6c#?|p
z6H}5Ci%a4&3vTftcm?@ICAT=CCS(@e;)XIyOEXh$2_V$L9G;t6T%4GmTFl14z@PvI
zx8j_wVnT~ki;82i6H77@V_fo+OLJ56N{VBA6N^hyi{f3JTw`1^i%W_!lS)fcQxt+L
zi%U{-i(?9k^0QKtOJY(Ga=OJ(xs=Mh#N5ney@E;<SES~pq!txPF)%QIBBJ;K0|P??
z!xM4Y>9vz;mxL{kTNt;+?YfEUMHAP{;%*mML>>rAP2iqkG$VUP>;*pU2KOiITs=0|
zx#cc$%Ux!dUtoBdUF8mk$aN06OB`}Ds;_WpBY2fpI5h8Y@J?W!;&WX@{i2Ba1!0W~
ze41A{wBVxp7e(|h2pe4BGrYoKbb~|UI*0s44*4a_3)~m;Tvsr@s9=0q!E^`D1@q9W
z9AO{W7&s+ytGL1u1~Qj*O3rmL!;4~u7etLN@EKp_F!>Bh^vR&a1Y&?NDC|M;`gsyF
zxFmy?77Pr*jL~p)L0HNq)VvrC*N3DFWH!hSBn-=uC?yNL{6Z*HLN0l*lxj%12um3T
z%g=dCp-e&i2vcD!B;5iqF$9ey3rZLW2{0>|$rKb`pd`ycq3I%E15pSx)8S<qLJ_#U
zf`+yN10vjmnX#2}5sa{~K!kiKQ;;;mJQyol2F8M^EM;O~C@=|S4w8q-AZS?Wna3K+
z8l;F2hp~cLP)tcjN)<{lH3(XXA(S1aUV#BgtqMX7jHSd7%7&yC8WIc)!K_I7NJy_J
z`mm%}T<JWR4S&eM!W|`!*h5)R&BJeo3WFwx-z|=u%;J*NywswXAkS9G!MF;g1qz9I
zDGEiUc?yXo3e~j=RtnX%MWD7x5y&G|3Qn+sTA?U4IWx5^HANw<C_h&r7+myODO3rT
zWMmdAWELwVrlb_578hG7XbKmBGE5OS0|P@5C~Fmga!3)Vu~7udr$w9$3=Frpic?EK
zrFecp38>ofi3e3Zt|7O0g8k#2g8Us_oE?K9ydc-mU{^;Mm!MlLNtt;mx7gD1i*gf7
zZgCW)CYOO6bBjBvG%YQ)D84weD)kmyN-C(yb&IvQASbh=h!^AvP{Tu$;}&OTL3|?E
zmA6>HH4QH$AmTv|NiDg>l9E`Gc#9qClOhR_R#5w(NQ{Ajp%~<La22DVpil&A4%`w#
zR7enmQj3c87#J9oLCW12L6yNB7S0ZjDKXbYH7<&3ToBQ`z@>GCMf(m5XOGTxF4c=%
zs#jRlo`^_I_nqXsL~Xg=LcJ|w*A1O68aiDTac=N^z#@2^Mdl)l%$%_6vU(R~_12VK
z*LS+8?{vWN3X9tfys}`uVi#G&W^i5**SNx>d54Ab0+-fxF2jplh8r|5b2(jMaeg48
zcwI#6qKMWS>&qhMjlK;o4|oLny*s_TeH+|w$g0ebof*5r<g%>6MHZ<B&o68Ytb*5B
zq%N^Y&9J`0qJD=(0Lrtx!lDZDs`C_{>jKIb1(YxFt6Ttk4lb&FQ9%0wzs?0N-7745
zPe5+bS&_0ndu8_O+$$_LAjk2@&PbmTd4Ws)3X8@KZvKAjPU~*l3oH^vpt44j{T5qN
zVsWaO3AhmfNlxG-rUr^8P#p{o`;`n}<&X&Cu*uC&Da}c>D>7tYU;w54Vo*u*ftit!
k@v9gEqttB%-rEeqAJ`c9g&Vj(vG6mRepZrXlmr_A0IIq$9smFU
literal 0
HcmV?d00001
diff --git a/__pycache__/leaderServer.cpython-313.pyc b/__pycache__/leaderServer.cpython-313.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e99351ab7fe318c165e2d5367bf5f7d80d6c7f38
GIT binary patch
literal 961
zcmey&%ge>Uz`$Vf$0ogynStRkhy%lnP{wC11_p+y48aUV48e>=jQR|PO!^E(%=!#P
zEWu1t3`MNL%u)<RY{4v23`OketeR|9+=fQxdIow1dPb(EnH|Cm49PIFKt?h%Fff4d
zXA7{o(I7D}4g!gSSqLJO!4#@jfdQdXg<&P5pC;2SzT(uPvecsZywsBN{G#kzY>5R0
zsd*`yjJG(0Au^c-#UT9(x00Q$VnT~ki;82i6H77@V_fo+OLJ56N{VBA6N^hyi{f3J
zTw`1^i%W_!lS)fcQxt+Li%U{-i(?9k^0QKtOJY(Ga=OJ(xt!F*l++@KReA-Lw>T41
zQXsq{4h9AWQ3eKvVlf5=h6aW^EJD{=Brmc^&d|KVqH>2@@&b$GXOK6s2aO(yL6go<
z1PVM&rdw<fHx;omFfeE`-r|OaP-$sq3M3?o*cliYz%KOxyS|8*fq_8^<WfGUOS#&8
z8+|8eUuBUi;$*-Tc~M{&h9X6ZH3I`fq8I~`2%!i~XNU$l6BG;#!HkHAPG`_$@~aYs
zgrtIBW^zV}LS~+VPiApRswQ(03&;a(MX9;@WvRDV3yL!HN<c9V^(idIA^zk^NzF+u
zNrf0yB*ehLAP@4YBG{`B*afEeU1nFh!y$H^L-rzv?2OE-92!qJcrWm&Ugb~&``%BJ
z;}%a+QGQ}da$<2wd}hHdJ_N5Izo-P_9G24J)S@D81_lOj%!30JY~4x*urUzVaM<ML
zr<CTT+7*d2Fff1;X0a&)1H%VqMn=XD0t^DO4LmmlMH~1&urUaUfGG~H29^(O3|u@7
XY@gVe7^OaOF*3@3=3-@32OA3ju5QWR
literal 0
HcmV?d00001
diff --git a/dynamic.py b/dynamic.py
index 07b4331..86591dd 100644
--- a/dynamic.py
+++ b/dynamic.py
@@ -18,19 +18,22 @@ buffer_size = 4096
def broadcast_sender(broadcast_ip, broadcast_port, server_ip, server_uuid):
#create UDP socket
broadcast_socket = socket.socket(socket.AF_INET,socket.SOCK_DGRAM)
- print(leaderServer.leader)
+ #print(leaderServer.leader)
+ message = f"{server_ip}::{server_uuid}"
if len(leaderServer.leader) == 0:
leaderServer.addLeader(server_uuid)
leaderServer.addServer(server_ip)
- print(leaderServer.leader)
- print(leaderServer.server_network)
+ print(f"Hi {leaderServer.leader}")
+ print(f'Hi {leaderServer.server_network}')
+ broadcast_socket.sendto(str(message).encode(), (broadcast_ip, broadcast_port))#for debug
else:
- # send message
- broadcast_socket.sendto(str(server_ip).encode(), (broadcast_ip, broadcast_port))
+ #send message
+ broadcast_socket.sendto(str(message).encode(), (broadcast_ip, broadcast_port))
+ print(f'else {leaderServer.server_network}')#for debug
def broadcast_listener(ip_adress, port):
- print(leaderServer.leader)
+ print(f"listener{leaderServer.leader}")#f for debug
print(leaderServer.server_network)
#UDP socket
listen_socket = socket.socket(socket.AF_INET,socket.SOCK_DGRAM)
@@ -42,9 +45,17 @@ def broadcast_listener(ip_adress, port):
print('listener up and run at {} : {}'.format(ip_adress, port))
data, address = listen_socket.recvfrom(buffer_size)
-
#hier jetzt async einbauen für ständige listen?
-
+ message=data.decode()
+ server_ip, server_uuid = message.split("::")
+
+ #if len(leaderServer.leader) == 0:
+ leaderServer.addLeader(server_uuid)
+ leaderServer.addServer(server_ip)
+ print(f"Hi {leaderServer.leader}")
+ print(f'Hi {leaderServer.server_network}')
+
print("Broadcast recieved from Sender: ", data.decode())
+ print(f"this is address: {address}")
return data.decode()
diff --git a/leaderServer.py b/leaderServer.py
index f0ced91..1cfcbc6 100644
--- a/leaderServer.py
+++ b/leaderServer.py
@@ -5,7 +5,7 @@
# Broadcast Informationen
-broadcast_ip = '127.0.0.255'
+broadcast_ip = '127.0.0.255' #192.168.1.255
broadcast_port = 5000
# Alle IP adressen der beteiligten Server
@@ -25,7 +25,7 @@ def addServer(Server_ip):
# Leader hinzufügen
def addLeader(server_uuid):
leader.append(server_uuid)
- return
+ #return leader
# löschen eines Servers
def deleteServer(server_ip):
--
GitLab