feat: Enhance IP analysis and broadcasting functionality with port handling

Author: weilycoder

Jiyu_udp_attack/__main__.py

@@ -11,6 +11,7 @@
 import binascii
 import shlex
 
+import sys
 from typing import Any, List, Sequence, cast
 
 try:
@@ -412,20 +413,20 @@ def main():
         if len(targets) == 0:
             parser.error("Target IP address cannot be empty. Use -h for help.")
 
+        print(*logger, sep="\n\n", end="\n\n")
+
         for target in targets:
-            broadcast_packet(
+            for dest in broadcast_packet(
                 teacher_ip, teacher_port, target, port, payload, ip_id=args.ip_id  # pylint: disable=E0601, E0606
-            )
-            logger.append(f"Sent packet with a length of {len(payload)} to {target}:{port}")
-
-        print(*logger, sep="\n\n")
+            ):
+                print(f"Sent packet with a length of {len(payload)} to {dest[0]}:{dest[1]}")
     except Exception as e:  # pylint: disable=broad-except
         parser.error(f"({e.__class__.__name__}) {e}")
 
 
 if __name__ == "__main__":
     main()
 else:
-    print("This script is intended to be run as a standalone program, not imported as a module.")
-    print("Please run it directly using 'python Jiyu_udp_attack/__main__.py' or similar command.")
+    print("This script is intended to be run as a standalone program, not imported as a module.", file=sys.stderr)
+    print("Please run it directly using 'python Jiyu_udp_attack/__main__.py' or similar command.", file=sys.stderr)
     raise ImportError("This script is not designed to be imported as a module.")

Jiyu_udp_attack/ip_analyze.py

@@ -26,7 +26,7 @@ def ip_to_tuple(ip: str) -> Tuple[int, int, int, int]:
     return ip_tuple
 
 
-def ip_analyze(ip: str) -> List[str]:  # pylint: disable=too-many-branches
+def ip_analyze(address: str) -> List[Tuple[str, int]]:
     """
     Analyzes an IP address or range and returns a list of valid IP addresses.
 
@@ -36,9 +36,15 @@ def ip_analyze(ip: str) -> List[str]:  # pylint: disable=too-many-branches
     Returns:
         list[str]: A list of valid IP addresses.
     """
-    if not isinstance(ip, str):
-        raise TypeError(f"Expected string, got {type(ip).__name__}")
-    ip = ip.replace(" ", "")
+    if not isinstance(address, str):
+        raise TypeError(f"Expected string, got {type(address).__name__}")
+    if address.count(":") > 1:
+        raise ValueError(f"Invalid address format: {address}")
+    address = address.replace(" ", "")
+    ip, port = address.split(":") if ":" in address else (address, -1)
+    if port != -1 and not (port.isdigit() and (0 <= int(port) <= 65535)):
+        raise ValueError(f"Invalid port number: {port}")
+    port = int(port)
     if "/" in ip:
         try:
             ip_addr, mask = ip.split("/")
@@ -52,7 +58,7 @@ def ip_analyze(ip: str) -> List[str]:  # pylint: disable=too-many-branches
         ip_tuple = ip_to_tuple(ip_addr)
         ip32 = ip_tuple[0] << 24 | ip_tuple[1] << 16 | ip_tuple[2] << 8 | ip_tuple[3]
         ip32 |= (1 << (32 - mask)) - 1
-        return [f"{(ip32 >> 24) & 0xFF}.{(ip32 >> 16) & 0xFF}.{(ip32 >> 8) & 0xFF}.{ip32 & 0xFF}"]
+        return [(f"{(ip32 >> 24) & 0xFF}.{(ip32 >> 16) & 0xFF}.{(ip32 >> 8) & 0xFF}.{ip32 & 0xFF}", port)]
     if "-" in ip:
         ip_range_tuple = ip.split(".")
         if len(ip_range_tuple) != 4:
@@ -75,11 +81,11 @@ def ip_analyze(ip: str) -> List[str]:  # pylint: disable=too-many-branches
         if ip_count > 65536:
             raise ValueError(f"IP address range too large: {ip_count} addresses")
         return [
-            f"{a}.{b}.{c}.{d}"
+            (f"{a}.{b}.{c}.{d}", port)
             for a in range(ip_range[0][0], ip_range[0][1] + 1)
             for b in range(ip_range[1][0], ip_range[1][1] + 1)
             for c in range(ip_range[2][0], ip_range[2][1] + 1)
             for d in range(ip_range[3][0], ip_range[3][1] + 1)
         ]
     ip_tuple = ip_to_tuple(ip)
-    return [f"{ip_tuple[0]}.{ip_tuple[1]}.{ip_tuple[2]}.{ip_tuple[3]}"]
+    return [(f"{ip_tuple[0]}.{ip_tuple[1]}.{ip_tuple[2]}.{ip_tuple[3]}", port)]

Jiyu_udp_attack/sender.py

@@ -5,7 +5,7 @@
 import struct
 import random
 import socket
-from typing import Optional
+from typing import List, Optional, Tuple
 
 try:
     from Jiyu_udp_attack.ip_analyze import ip_analyze
@@ -160,7 +160,7 @@ def broadcast_packet(
     payload: bytes,
     *,
     ip_id: Optional[int] = None,
-) -> None:
+) -> List[Tuple[str, int]]:
     """
     Sends a broadcast UDP packet to the specified destination IP address or range.
 
@@ -172,6 +172,14 @@ def broadcast_packet(
         dst_ip (str): The broadcast IP address (e.g., "192.168.1.255", "192.168.1.0/24", "192.168.1.10-100").
         dst_port (int): The destination port number.
         payload (bytes): The data payload to include in the packet.
+        ip_id (Optional[int]): The IP identification number. If None, a random ID will be used.
+        
+    Returns:
+        List[Tuple[str, int]]: A list of tuples containing the IP addresses and ports to which the packets were sent.
     """
-    for ip in ip_analyze(dst_ip):
+    sent_list: List[Tuple[str, int]] = []
+    for ip, port in ip_analyze(dst_ip):
+        port = port if 0 <= port <= 0xffff else dst_port
         send_packet(src_ip, src_port, ip, dst_port, payload, ip_id=ip_id)
+        sent_list.append((ip, port))
+    return sent_list

README.md

@@ -113,6 +113,14 @@ Example usage:
 + 指定 ip 段，如 `192.168.3.0/24`，这将被转换到广播地址 `192.168.3.255`；
 + 使用极域的组播地址 `224.50.50.42`。
 
+### Specify the Port
+
+一般情况下，可以使用 `-tp` 指定端口，默认为 `4705`，这是 2016 版极域使用的端口。如果你使用的是其他版本的极域，可能需要指定其他端口。
+
+不过，也可以直接在 `-t` 中指定端口，例如 `-t 192.168.233.100:1234`，这样，在向该 ip 发送数据包时，将使用指定的端口。
+
+对于教师机的端口，暂时不支持该语法，只能使用 `-fp` 指定。
+
 ### `--setting`
 
 由于 `--setting` 的配置过于复杂，程序将其的配置项传入另一个命令行解析器，帮助文档如下：

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "Jiyu-udp-attack"
-version = "1.2.0"
+version = "1.2.1"
 description = "Send packets to student machines disguised as Jiyu teacher machine"
 authors = ["weilycoder <weily2009@outlook.com>"]
 license = "MIT"