Merge branch 'master' into coap_sockets

Author: Nils Weiss

.gitlab-ci.yml

@@ -0,0 +1,55 @@
+
+.default:
+  image: python:3.11
+  tags:
+    - docker-ipv6
+  before_script:
+    - pip install tox
+
+health:
+  extends: .default
+  script:
+    - tox -e flake8
+    - tox -e spell
+    - tox -e twine
+
+mypy:
+  extends: .default
+  script:
+    - tox -e mypy
+
+py311:
+  image: dissecto/scapy-tests:latest
+  tags:
+    - docker-ipv6
+  script:
+    - ./.config/ci/test.sh 3.11 non_root
+
+pypy3:
+  image: dissecto/scapy-tests-pypy:latest
+  tags:
+    - docker-ipv6
+  script:
+    - ./.config/ci/test.sh pypy3 non_root
+
+.publish:
+  image: python:latest
+  needs:
+    - pypy3
+    - py311
+    - mypy
+    - health
+  tags:
+    - docker
+  script:
+    - pip install build twine
+    - python -m build
+    - TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token python -m twine upload --verbose --repository-url ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi dist/*
+
+deploy:
+  extends: .publish
+  rules:
+    - if: '$CI_COMMIT_TAG'
+      when: always
+    - when: never
+  allow_failure: true

AGENTS.md

@@ -0,0 +1,38 @@
+# AGENTS.md
+
+## Scope and source of truth
+- Work in the top-level tree (`/scapy`), not the vendored release snapshot (`/scapy-2.7.1.dev...`) or `build/` artifacts.
+- Start with `README.md`, `CONTRIBUTING.md`, `tox.ini`, and `test/run_tests` before changing behavior.
+
+## Big-picture architecture
+- Public API aggregation is import-driven: `scapy/all.py` pulls core modules, then `scapy/layers/all.py` autoloads layer modules from `conf.load_layers` (`scapy/config.py`).
+- Core packet model is `Packet` (`scapy/packet.py`): layers are stacked with `/`, dissection/build behavior hangs off `fields_desc`, `payload_guess`, and `post_build`.
+- Layer binding is declarative and two-way via `bind_layers()` / `split_layers()` (`scapy/packet.py`); this controls both build-time field overloading and dissect-time next-layer guessing.
+- Runtime/CLI bootstrapping lives in `scapy/main.py` (`interact`, `load_layer`, `load_contrib`, extension loading).
+- Platform socket backends are selected centrally in `scapy/config.py` (`conf.use_pcap`, `conf.use_bpf`, OS-specific `scapy/arch/*`).
+
+## Where to place new code
+- Common protocols -> `scapy/layers/`; uncommon/vendor-specific -> `scapy/contrib/` (see `CONTRIBUTING.md`).
+- `scapy/layers/*` must not import `scapy/contrib/*`; `contrib` may import either.
+- Contrib modules must declare metadata headers near the top, e.g. in `scapy/contrib/automotive/scanner/graph.py`:
+  - `# scapy.contrib.description = ...`
+  - `# scapy.contrib.status = ...`
+
+## Developer workflows that match CI
+- Fast local baseline (no extra external tools): `./test/run_tests`
+- Direct UTScapy run with config file: `python -m scapy.tools.UTscapy -c test/configs/linux.utsc`
+- Lint/type/docs parity with CI: `tox -e flake8`, `tox -e mypy`, `tox -e docs`, `tox -e spell`
+- Full matrix behavior is driven by `.github/workflows/unittests.yml` + `.config/ci/test.sh` (keyword skips via `UT_FLAGS`, root/non-root split, OS-specific toggles).
+
+## Project-specific conventions
+- Keep hot-path core changes lean (`scapy/packet.py`, `scapy/base_classes.py`): performance and allocation overhead matter.
+- Logging policy is strict (`CONTRIBUTING.md`): prefer `scapy.error.log_runtime` for runtime behavior; use `log_interactive` only for interactive-shell-only messages.
+- Test style is UTScapy-first (`test/*.uts`, `test/scapy/**/*.uts`): last expression decides pass/fail; keyword include/exclude (`-k` / `-K`) is heavily used.
+- Preserve SPDX/license headers and existing typing-comment style (`# type:`) where present.
+
+## Integration points and dependencies
+- Optional features are capability-gated in `scapy/config.py` (notably `cryptography`, libpcap/bpf selection, extension manager `conf.exts`).
+- Some features depend on external binaries configured via `conf.prog` (`tcpdump`, `tshark`, `wireshark`, `dot`).
+- Docs and API tree are Sphinx-based (`doc/scapy/`, `tox -e docs`, `tox -e apitree`).
+- Test selection/behavior depends on `test/configs/*.utsc` preexec hooks (for example loading `tls` or contrib modules before campaigns).
+

pyproject.toml

@@ -1,10 +1,11 @@
 [build-system]
-requires = [ "setuptools>=62.0.0" ]
+requires = ["setuptools>=64.0", "setuptools-scm>=8.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "scapy"
-dynamic = [ "version", "readme" ]
+dynamic = [ "version"]
+readme = "README.md"
 authors = [
     { name="Philippe BIONDI" },
     { name="Gabriel POTTER" },
@@ -81,8 +82,7 @@ exclude = [
     "doc*",
 ]
 
-[tool.setuptools.dynamic]
-version = { attr="scapy.VERSION" }
+[tool.setuptools_scm]
 
 # coverage
 

scapy/contrib/automotive/scanner/graph.py

@@ -54,9 +54,13 @@ def add_edge(self, edge, transition_function=None):
         :param edge: edge from node to node
         :param transition_function: tuple with enter and cleanup function
         """
-        if edge[1] in self.edges[edge[0]]:
-            # Edge already exists
-            return
+        try:
+            if edge[1] in self.edges[edge[0]]:
+                # Edge already exists
+                return
+        except KeyError:
+            pass
+
         self.edges[edge[0]].append(edge[1])
         self.weights[edge] = 1
         self.__transition_functions[edge] = transition_function