Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai

src/client.py

@@ -209,7 +209,8 @@ def check_merge(ct: int, ip: str):
         temp_cfrag_cts = []
         for i in cfrag_cts:
             capsule = pickle.loads(i[0])
-            temp_cfrag_cts.append((capsule, int(i[1]).to_bytes(32)))
+            byte_length = (ct.bit_length() + 7) // 8
+            temp_cfrag_cts.append((capsule, int(i[1]).to_bytes(byte_length)))
 
         cfrags = mergecfrag(temp_cfrag_cts)
 
@@ -367,10 +368,12 @@ async def receive_request(i_m: IP_Message):
     # message = xxxxx
 
     # 根据message name到测试文本查找对应值
-    message = test_msessgaes[i_m.message_name]
+    try:
+        message = test_msessgaes[i_m.message_name]
 
-    # message = b"hello world" + random.randbytes(8)
-    print(f"Generated message: {message}")
+    except:
+        message = b"hello world" + random.randbytes(8)
+    print(f"Message to be send: {message}")
 
     # send message to nodes
     await send_messages(tuple(node_ips), message, dest_ip, pk_B, threshold)

src/node.py

@@ -32,7 +32,7 @@ processed_message = ()  # 重加密后的数据
 
 # 向中心服务器发送自己的IP地址,并获取自己的id
 def send_ip():
-    url = server_address + "/get_node?ip=" + ip
+    url = server_address + "/get_node?ip=" + ip  # type: ignore
     # ip = get_local_ip() # type: ignore
     global id
     id = requests.get(url, timeout=3)
@@ -52,7 +52,6 @@ def get_local_ip():
             s.close()
         except:
             raise ValueError("Unable to get IP")
-            
 
 
 def init():
@@ -72,7 +71,7 @@ def clear():
 async def send_heartbeat_internal() -> None:
     timeout = 30
     global ip
-    url = server_address + "/heartbeat?ip=" + ip
+    url = server_address + "/heartbeat?ip=" + ip  # type: ignore
     while True:
         # print('successful send my_heart')
         try:
@@ -112,7 +111,10 @@ async def user_src(message: Req):
     dest_ip = message.dest_ip
     capsule = message.capsule
     ct = message.ct
-    capsule_ct = (capsule, ct.to_bytes(32))
+    
+    byte_length = (ct.bit_length() + 7) // 8
+    capsule_ct = (capsule, ct.to_bytes(byte_length))
+
     rk = message.rk
     print(f"Computed capsule_ct: {capsule_ct}")
     a, b = ReEncrypt(rk, capsule_ct)