服务端本地IP可调:TCP/UDP服务端绑定指定本地IP,UDP服务端回发给最近远端;新增发布日志
This commit is contained in:
+13
-8
@@ -1946,12 +1946,12 @@ class NetPanel(BasePanel):
|
||||
server = self.combox_mode.currentText() == '服务端'
|
||||
if server:
|
||||
self.edit_ip.setText(get_local_ip())
|
||||
self.edit_ip.setEnabled(False)
|
||||
self.edit_ip.setEnabled(True)
|
||||
self.edit_ip.setToolTip('监听的本机IP;填 0.0.0.0 表示监听所有网卡')
|
||||
self.ip_label.setText('本地IP')
|
||||
if self.btn_conn.text() not in ('停止',):
|
||||
pass
|
||||
else:
|
||||
self.edit_ip.setEnabled(True)
|
||||
self.edit_ip.setToolTip('目标IP')
|
||||
self.ip_label.setText('目标IP')
|
||||
if self.kind == 'tcp' and self.client_bar is not None:
|
||||
self.client_bar.setVisible(server)
|
||||
@@ -2006,12 +2006,12 @@ class NetPanel(BasePanel):
|
||||
|
||||
def start_server(self):
|
||||
port = self.spin_port.value()
|
||||
local = self.edit_ip.text().strip() or get_local_ip()
|
||||
local = self.edit_ip.text().strip() or '0.0.0.0'
|
||||
try:
|
||||
if self.kind == 'tcp':
|
||||
srv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
srv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
srv.bind(('0.0.0.0', port))
|
||||
srv.bind((local, port))
|
||||
srv.listen(10)
|
||||
srv.settimeout(0.5)
|
||||
self.sock = srv
|
||||
@@ -2020,7 +2020,7 @@ class NetPanel(BasePanel):
|
||||
threading.Thread(target=self.accept_loop, daemon=True).start()
|
||||
else:
|
||||
srv = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
|
||||
srv.bind(('0.0.0.0', port))
|
||||
srv.bind((local, port))
|
||||
srv.settimeout(0.5)
|
||||
self.sock = srv
|
||||
self.btn_conn.setText('停止')
|
||||
@@ -2132,9 +2132,14 @@ class NetPanel(BasePanel):
|
||||
if not self.sock:
|
||||
QMessageBox.warning(self, '提示', '请先连接或启动服务器')
|
||||
return False
|
||||
ip = self.edit_ip.text().strip() or '127.0.0.1'
|
||||
server = self.combox_mode.currentText() == '服务端'
|
||||
if server and getattr(self, 'last_remote', None):
|
||||
addr = self.last_remote
|
||||
else:
|
||||
ip = self.edit_ip.text().strip() or '127.0.0.1'
|
||||
addr = (ip, self.spin_port.value())
|
||||
try:
|
||||
self.sock.sendto(data, (ip, self.spin_port.value()))
|
||||
self.sock.sendto(data, addr)
|
||||
return True
|
||||
except Exception as e:
|
||||
QMessageBox.warning(self, '错误', f'发送失败\n{e}')
|
||||
|
||||
Reference in New Issue
Block a user