Compare commits
7 Commits
v1.2.1
...
4322393de7
| Author | SHA1 | Date | |
|---|---|---|---|
| 4322393de7 | |||
| 215e264e5f | |||
| 99573cba5c | |||
| ac1c40d754 | |||
| 9ef788fe5b | |||
| 27304992a0 | |||
| 07b93d1382 |
@@ -8,24 +8,30 @@ on:
|
|||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
|
# Self-contained: no external (GitHub-hosted) actions. Runs on a self-hosted
|
||||||
|
# Windows runner (label `windows`) that already has Python 3.12 on PATH.
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: windows-latest
|
runs-on: windows
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- name: Checkout repository at tag
|
||||||
|
shell: pwsh
|
||||||
- name: Set up Python
|
env:
|
||||||
uses: actions/setup-python@v5
|
TOKEN: ${{ github.token }}
|
||||||
with:
|
run: |
|
||||||
python-version: '3.12'
|
$base = "${{ github.server_url }}" -replace '^https://', ''
|
||||||
|
$url = "https://oauth2:$env:TOKEN@$base/${{ github.repository }}.git"
|
||||||
|
git clone --depth 1 --branch "$env:GITHUB_REF_NAME" $url .
|
||||||
|
|
||||||
- name: Install build dependencies
|
- name: Install build dependencies
|
||||||
run: python -m pip install --upgrade pip pyinstaller rich
|
run: python -m pip install --upgrade pip pyinstaller rich
|
||||||
|
|
||||||
- name: Resolve version from tag
|
- name: Resolve version from tag
|
||||||
id: ver
|
id: ver
|
||||||
shell: bash
|
shell: pwsh
|
||||||
run: echo "version=${GITHUB_REF_NAME#v}" >> "$GITHUB_OUTPUT"
|
run: |
|
||||||
|
$v = "$env:GITHUB_REF_NAME" -replace '^v', ''
|
||||||
|
"version=$v" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8
|
||||||
|
|
||||||
- name: Build executable
|
- name: Build executable
|
||||||
run: python -m PyInstaller --onefile --uac-admin --console --name dhcpsrv --icon assets/icon.ico --paths src dhcpsrv-launcher.py
|
run: python -m PyInstaller --onefile --uac-admin --console --name dhcpsrv --icon assets/icon.ico --paths src dhcpsrv-launcher.py
|
||||||
@@ -39,7 +45,6 @@ jobs:
|
|||||||
Copy-Item dist/dhcpsrv.exe $folder/
|
Copy-Item dist/dhcpsrv.exe $folder/
|
||||||
@"
|
@"
|
||||||
dhcpsrv v$ver - portable edition
|
dhcpsrv v$ver - portable edition
|
||||||
made by engelgardt
|
|
||||||
|
|
||||||
Minimal laptop-side DHCP server for storage/server engineers.
|
Minimal laptop-side DHCP server for storage/server engineers.
|
||||||
|
|
||||||
@@ -71,10 +76,19 @@ jobs:
|
|||||||
"$hash $zip" | Out-File -FilePath "$zip.sha256" -Encoding ASCII -NoNewline
|
"$hash $zip" | Out-File -FilePath "$zip.sha256" -Encoding ASCII -NoNewline
|
||||||
Get-Content "$zip.sha256"
|
Get-Content "$zip.sha256"
|
||||||
|
|
||||||
- name: Create release
|
- name: Publish Gitea release
|
||||||
uses: softprops/action-gh-release@v2
|
shell: pwsh
|
||||||
with:
|
env:
|
||||||
files: |
|
TOKEN: ${{ github.token }}
|
||||||
dhcpsrv-portable-v${{ steps.ver.outputs.version }}.zip
|
run: |
|
||||||
dhcpsrv-portable-v${{ steps.ver.outputs.version }}.zip.sha256
|
$ver = '${{ steps.ver.outputs.version }}'
|
||||||
generate_release_notes: true
|
$tag = "v$ver"
|
||||||
|
$api = "${{ github.server_url }}/api/v1/repos/${{ github.repository }}"
|
||||||
|
$hdr = @{ Authorization = "token $env:TOKEN" }
|
||||||
|
$body = @{ tag_name = $tag; name = $tag; draft = $false; prerelease = $false } | ConvertTo-Json
|
||||||
|
$rel = Invoke-RestMethod -Method Post -Uri "$api/releases" -Headers $hdr -ContentType 'application/json' -Body $body
|
||||||
|
$rid = $rel.id
|
||||||
|
foreach ($f in @("dhcpsrv-portable-v$ver.zip", "dhcpsrv-portable-v$ver.zip.sha256")) {
|
||||||
|
curl.exe -s -H "Authorization: token $env:TOKEN" -F "attachment=@$f" "$api/releases/$rid/assets?name=$f" | Out-Null
|
||||||
|
Write-Host "uploaded $f"
|
||||||
|
}
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
name: Bug report
|
|
||||||
description: Something doesn't work as expected
|
|
||||||
labels: ["bug"]
|
|
||||||
body:
|
|
||||||
- type: input
|
|
||||||
id: version
|
|
||||||
attributes:
|
|
||||||
label: Version
|
|
||||||
description: Visible in the startup banner.
|
|
||||||
placeholder: v1.1.0
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: steps
|
|
||||||
attributes:
|
|
||||||
label: Steps to reproduce
|
|
||||||
placeholder: |
|
|
||||||
1. ...
|
|
||||||
2. ...
|
|
||||||
3. ...
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: expected
|
|
||||||
attributes:
|
|
||||||
label: What you expected to happen
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: actual
|
|
||||||
attributes:
|
|
||||||
label: What actually happened
|
|
||||||
description: Paste any error output verbatim. Screenshots are welcome.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: input
|
|
||||||
id: os
|
|
||||||
attributes:
|
|
||||||
label: Windows version
|
|
||||||
placeholder: e.g. Windows 11 24H2
|
|
||||||
|
|
||||||
- type: input
|
|
||||||
id: network
|
|
||||||
attributes:
|
|
||||||
label: Network setup (if relevant)
|
|
||||||
placeholder: e.g. USB Realtek NIC to a server's BMC port via an 8-port switch
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: extra
|
|
||||||
attributes:
|
|
||||||
label: Anything else?
|
|
||||||
description: Workarounds tried, related links, etc.
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
blank_issues_enabled: false
|
|
||||||
contact_links:
|
|
||||||
- name: Security vulnerability
|
|
||||||
url: https://github.com/Engelgardt23/dhcpsrv/security/advisories/new
|
|
||||||
about: Please report security issues privately via GitHub Security Advisories — not as a public issue.
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
name: Feature request
|
|
||||||
description: Suggest a new feature or an improvement
|
|
||||||
labels: ["enhancement"]
|
|
||||||
body:
|
|
||||||
- type: textarea
|
|
||||||
id: motivation
|
|
||||||
attributes:
|
|
||||||
label: What's the use case?
|
|
||||||
description: What are you trying to do, and why is the current behavior not enough?
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: proposal
|
|
||||||
attributes:
|
|
||||||
label: Proposed solution
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: alternatives
|
|
||||||
attributes:
|
|
||||||
label: Alternatives considered
|
|
||||||
+17
-11
@@ -6,9 +6,14 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [1.2.3] - 2026-06-01
|
||||||
|
### Changed
|
||||||
|
- Project is now fully self-hosted on Gitea (`git.engelgardt23.ru`): update-check, links and badges no longer reference GitHub.
|
||||||
|
- CI moved to self-contained Gitea Actions (no GitHub-hosted actions); releases are built on a self-hosted Windows runner and published to the local instance.
|
||||||
|
|
||||||
## [1.2.1] - 2026-05-18
|
## [1.2.1] - 2026-05-18
|
||||||
### Changed
|
### Changed
|
||||||
- The `Update available (vX.Y.Z)` hint in the header is now a clickable hyperlink that opens the GitHub releases page (OSC 8 terminal hyperlink). Modern terminals (Windows Terminal, VS Code, WezTerm, most Linux/macOS terminals) render it as a link — `Ctrl+Click` to follow. Older consoles show the plain text, so nothing breaks.
|
- The `Update available (vX.Y.Z)` hint in the header is now a clickable hyperlink that opens the releases page (OSC 8 terminal hyperlink). Modern terminals (Windows Terminal, VS Code, WezTerm, most Linux/macOS terminals) render it as a link — `Ctrl+Click` to follow. Older consoles show the plain text, so nothing breaks.
|
||||||
- Russian tagline tightened: dropped the `для инженера` phrase, the wording was carried over from an earlier draft and felt out of place.
|
- Russian tagline tightened: dropped the `для инженера` phrase, the wording was carried over from an earlier draft and felt out of place.
|
||||||
|
|
||||||
## [1.2.0] - 2026-05-18
|
## [1.2.0] - 2026-05-18
|
||||||
@@ -35,11 +40,11 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and
|
|||||||
|
|
||||||
## [1.1.0] - 2026-05-16
|
## [1.1.0] - 2026-05-16
|
||||||
### Added
|
### Added
|
||||||
- Auto-update check on startup. Polls GitHub `/releases/latest` with a 3-second timeout. If a newer version is available, prints a yellow notice and offers to open the download page in your browser. Silent on offline / API errors.
|
- Auto-update check on startup. Polls the Gitea instance `/releases/latest` with a 3-second timeout. If a newer version is available, prints a yellow notice and offers to open the download page in your browser. Silent on offline / API errors.
|
||||||
|
|
||||||
## [1.0.0] - 2026-05-16
|
## [1.0.0] - 2026-05-16
|
||||||
### Added
|
### Added
|
||||||
- First public release on GitHub.
|
- First public release.
|
||||||
- Single portable `.exe` (~12 MB) — no Python required on target machines.
|
- Single portable `.exe` (~12 MB) — no Python required on target machines.
|
||||||
- Full-screen TUI built on `rich`: header with server config + live counters (Leases / Pkts / DISCOVER / REQUEST / RELEASE), clients table (`#`, IP, Hostname, MAC, Last seen, Ping), scrolling events panel.
|
- Full-screen TUI built on `rich`: header with server config + live counters (Leases / Pkts / DISCOVER / REQUEST / RELEASE), clients table (`#`, IP, Hostname, MAC, Last seen, Ping), scrolling events panel.
|
||||||
- Hardcoded sensible defaults: server `10.10.10.1/24`, pool `10.10.10.2..10.10.10.51` (50 addresses), lease `7200 s`, TFTP option (66/150) = server IP.
|
- Hardcoded sensible defaults: server `10.10.10.1/24`, pool `10.10.10.2..10.10.10.51` (50 addresses), lease `7200 s`, TFTP option (66/150) = server IP.
|
||||||
@@ -51,11 +56,12 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and
|
|||||||
- Scrollback cleared on startup so mouse-wheel doesn't expose pre-launch text.
|
- Scrollback cleared on startup so mouse-wheel doesn't expose pre-launch text.
|
||||||
- MIT licensed.
|
- MIT licensed.
|
||||||
|
|
||||||
[Unreleased]: https://github.com/Engelgardt23/dhcpsrv/compare/v1.2.1...HEAD
|
[Unreleased]: https://git.engelgardt23.ru/engel/dhcpsrv/compare/v1.2.3...HEAD
|
||||||
[1.2.1]: https://github.com/Engelgardt23/dhcpsrv/compare/v1.2.0...v1.2.1
|
[1.2.3]: https://git.engelgardt23.ru/engel/dhcpsrv/compare/v1.2.1...v1.2.3
|
||||||
[1.2.0]: https://github.com/Engelgardt23/dhcpsrv/compare/v1.1.3...v1.2.0
|
[1.2.1]: https://git.engelgardt23.ru/engel/dhcpsrv/compare/v1.2.0...v1.2.1
|
||||||
[1.1.3]: https://github.com/Engelgardt23/dhcpsrv/compare/v1.1.2...v1.1.3
|
[1.2.0]: https://git.engelgardt23.ru/engel/dhcpsrv/compare/v1.1.3...v1.2.0
|
||||||
[1.1.2]: https://github.com/Engelgardt23/dhcpsrv/compare/v1.1.1...v1.1.2
|
[1.1.3]: https://git.engelgardt23.ru/engel/dhcpsrv/compare/v1.1.2...v1.1.3
|
||||||
[1.1.1]: https://github.com/Engelgardt23/dhcpsrv/compare/v1.1.0...v1.1.1
|
[1.1.2]: https://git.engelgardt23.ru/engel/dhcpsrv/compare/v1.1.1...v1.1.2
|
||||||
[1.1.0]: https://github.com/Engelgardt23/dhcpsrv/compare/v1.0.0...v1.1.0
|
[1.1.1]: https://git.engelgardt23.ru/engel/dhcpsrv/compare/v1.1.0...v1.1.1
|
||||||
[1.0.0]: https://github.com/Engelgardt23/dhcpsrv/releases/tag/v1.0.0
|
[1.1.0]: https://git.engelgardt23.ru/engel/dhcpsrv/compare/v1.0.0...v1.1.0
|
||||||
|
[1.0.0]: https://git.engelgardt23.ru/engel/dhcpsrv/releases/tag/v1.0.0
|
||||||
|
|||||||
+5
-6
@@ -6,15 +6,14 @@
|
|||||||
|
|
||||||
```
|
```
|
||||||
dhcpsrv/
|
dhcpsrv/
|
||||||
├── .github/
|
├── .gitea/
|
||||||
│ ├── workflows/release.yml ← CI: tag-driven build + GitHub Release
|
│ └── workflows/release.yml ← CI: tag-driven build + Gitea Release
|
||||||
│ └── ISSUE_TEMPLATE/ ← bug / feature / security routing
|
|
||||||
├── src/dhcpsrv/ ← package source (≤200 lines per module)
|
├── src/dhcpsrv/ ← package source (≤200 lines per module)
|
||||||
│ ├── __init__.py ← single source of truth for __version__
|
│ ├── __init__.py ← single source of truth for __version__
|
||||||
│ ├── __main__.py ← entry: python -m dhcpsrv
|
│ ├── __main__.py ← entry: python -m dhcpsrv
|
||||||
│ ├── app.py ← main flow, wires everything
|
│ ├── app.py ← main flow, wires everything
|
||||||
│ ├── platform_win.py ← VT enable + UAC self-elevate
|
│ ├── platform_win.py ← VT enable + UAC self-elevate
|
||||||
│ ├── update_check.py ← GitHub /releases/latest poll
|
│ ├── update_check.py ← Gitea /releases/latest poll
|
||||||
│ ├── network.py ← list_adapters, netsh, ping (no shared state)
|
│ ├── network.py ← list_adapters, netsh, ping (no shared state)
|
||||||
│ ├── dhcp.py ← DhcpConfig, DhcpServer, packet parse/build
|
│ ├── dhcp.py ← DhcpConfig, DhcpServer, packet parse/build
|
||||||
│ └── ui.py ← rich-based full-screen TUI
|
│ └── ui.py ← rich-based full-screen TUI
|
||||||
@@ -64,7 +63,7 @@ flag tells PyInstaller where to find the `dhcpsrv` package itself. Output:
|
|||||||
4. Tag: `git tag vX.Y.Z`.
|
4. Tag: `git tag vX.Y.Z`.
|
||||||
5. Push: `git push && git push --tags`.
|
5. Push: `git push && git push --tags`.
|
||||||
|
|
||||||
That's it. GitHub Actions picks up the tag, builds the exe, writes the SHA-256, and creates the GitHub Release with the zip attached.
|
That's it. Gitea Actions picks up the tag, builds the exe, writes the SHA-256, and creates the Gitea Release with the zip attached.
|
||||||
|
|
||||||
## Where features go
|
## Where features go
|
||||||
|
|
||||||
@@ -76,4 +75,4 @@ That's it. GitHub Actions picks up the tag, builds the exe, writes the SHA-256,
|
|||||||
| Something shown in the header | `ui.py` → `Ui._render_header` |
|
| Something shown in the header | `ui.py` → `Ui._render_header` |
|
||||||
| A startup check or banner line | `app.py` → `main()` |
|
| A startup check or banner line | `app.py` → `main()` |
|
||||||
| A change to UAC / VT logic | `platform_win.py` |
|
| A change to UAC / VT logic | `platform_win.py` |
|
||||||
| Tweaking the GitHub update-check UX | `update_check.py` |
|
| Tweaking the update-check UX | `update_check.py` |
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# dhcpsrv
|
# dhcpsrv
|
||||||
|
|
||||||
[](https://github.com/Engelgardt23/dhcpsrv/releases/latest)
|
[](https://git.engelgardt23.ru/engel/dhcpsrv/releases/latest)
|
||||||
[](LICENSE)
|
[](LICENSE)
|
||||||
|
|
||||||
🇺🇸 English | [🇷🇺 Русский](README.ru.md)
|
🇺🇸 English | [🇷🇺 Русский](README.ru.md)
|
||||||
@@ -10,13 +10,11 @@ One double-click — pick a NIC — done. Live table of clients, ping status, pa
|
|||||||
|
|
||||||
Built for the “plug the cable in, watch a BMC pop up with an IP” workflow during firmware updates, recovery, and benchmarks.
|
Built for the “plug the cable in, watch a BMC pop up with an IP” workflow during firmware updates, recovery, and benchmarks.
|
||||||
|
|
||||||
> **Made by engelgardt.**
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Download
|
## Download
|
||||||
|
|
||||||
Grab the latest release: [**releases page**](https://github.com/Engelgardt23/dhcpsrv/releases/latest).
|
Grab the latest release: [**releases page**](https://git.engelgardt23.ru/engel/dhcpsrv/releases/latest).
|
||||||
The asset is `dhcpsrv-portable-vX.Y.Z.zip` (~12 MB).
|
The asset is `dhcpsrv-portable-vX.Y.Z.zip` (~12 MB).
|
||||||
|
|
||||||
## Run
|
## Run
|
||||||
@@ -39,7 +37,7 @@ The asset is `dhcpsrv-portable-vX.Y.Z.zip` (~12 MB).
|
|||||||
## What's on screen
|
## What's on screen
|
||||||
|
|
||||||
```
|
```
|
||||||
┌─ dhcpsrv v1.0.0 made by engelgardt ────────────────────────────────────┐
|
┌─ dhcpsrv v1.0.0 ────────────────────────────────────────────────────────┐
|
||||||
│ Server: 10.10.10.1/255.255.255.0 Pool: 10.10.10.2–10.10.10.51 … │
|
│ Server: 10.10.10.1/255.255.255.0 Pool: 10.10.10.2–10.10.10.51 … │
|
||||||
│ Leases: 3/50 Pkts: 47 DISCOVER: 12 REQUEST: 11 RELEASE: 0 │
|
│ Leases: 3/50 Pkts: 47 DISCOVER: 12 REQUEST: 11 RELEASE: 0 │
|
||||||
└─────────────────────────────────────────────────────────────────────────┘
|
└─────────────────────────────────────────────────────────────────────────┘
|
||||||
|
|||||||
+2
-4
@@ -1,6 +1,6 @@
|
|||||||
# dhcpsrv
|
# dhcpsrv
|
||||||
|
|
||||||
[](https://github.com/Engelgardt23/dhcpsrv/releases/latest)
|
[](https://git.engelgardt23.ru/engel/dhcpsrv/releases/latest)
|
||||||
[](LICENSE)
|
[](LICENSE)
|
||||||
|
|
||||||
[🇺🇸 English](README.md) | 🇷🇺 Русский
|
[🇺🇸 English](README.md) | 🇷🇺 Русский
|
||||||
@@ -10,13 +10,11 @@
|
|||||||
|
|
||||||
Сделан под сценарий «воткнул кабель, увидел как BMC получил IP» во время прошивки, восстановления и бенчмарков.
|
Сделан под сценарий «воткнул кабель, увидел как BMC получил IP» во время прошивки, восстановления и бенчмарков.
|
||||||
|
|
||||||
> **Автор: engelgardt.**
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Скачать
|
## Скачать
|
||||||
|
|
||||||
Последний релиз: [**страница релизов**](https://github.com/Engelgardt23/dhcpsrv/releases/latest).
|
Последний релиз: [**страница релизов**](https://git.engelgardt23.ru/engel/dhcpsrv/releases/latest).
|
||||||
Архив `dhcpsrv-portable-vX.Y.Z.zip` (~12 МБ).
|
Архив `dhcpsrv-portable-vX.Y.Z.zip` (~12 МБ).
|
||||||
|
|
||||||
## Запуск
|
## Запуск
|
||||||
|
|||||||
+2
-4
@@ -6,16 +6,14 @@ on the host — so vulnerability reports are very welcome.
|
|||||||
|
|
||||||
## Supported versions
|
## Supported versions
|
||||||
|
|
||||||
Only the latest tagged release on GitHub is supported. Older versions will not
|
Only the latest tagged release is supported. Older versions will not
|
||||||
get fixes; please upgrade first.
|
get fixes; please upgrade first.
|
||||||
|
|
||||||
## How to report a vulnerability
|
## How to report a vulnerability
|
||||||
|
|
||||||
**Please do not open a public issue** for security-sensitive findings.
|
**Please do not open a public issue** for security-sensitive findings.
|
||||||
|
|
||||||
Use GitHub's private security advisories: go to the
|
Report privately by email to the maintainer at engelgardt2024@gmail.com.
|
||||||
[Security tab](../../security/advisories/new) of this repo and click
|
|
||||||
"Report a vulnerability". GitHub will route it privately.
|
|
||||||
|
|
||||||
Please include:
|
Please include:
|
||||||
- The version you tested (the startup banner is enough).
|
- The version you tested (the startup banner is enough).
|
||||||
|
|||||||
+2
-2
@@ -13,8 +13,8 @@ dependencies = ["rich>=13"]
|
|||||||
dynamic = ["version"]
|
dynamic = ["version"]
|
||||||
|
|
||||||
[project.urls]
|
[project.urls]
|
||||||
Homepage = "https://github.com/Engelgardt23/dhcpsrv"
|
Homepage = "https://git.engelgardt23.ru/engel/dhcpsrv"
|
||||||
Issues = "https://github.com/Engelgardt23/dhcpsrv/issues"
|
Issues = "https://git.engelgardt23.ru/engel/dhcpsrv/issues"
|
||||||
|
|
||||||
[project.scripts]
|
[project.scripts]
|
||||||
dhcpsrv = "dhcpsrv.app:main"
|
dhcpsrv = "dhcpsrv.app:main"
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
"""
|
"""
|
||||||
dhcpsrv - portable laptop-side DHCP server for storage/server engineers.
|
dhcpsrv - portable laptop-side DHCP server for storage/server engineers.
|
||||||
made by engelgardt
|
|
||||||
|
|
||||||
The single source of truth for the project version. Bump this before tagging
|
The single source of truth for the project version. Bump this before tagging
|
||||||
a release; CI reads the tag, the code reads this constant.
|
a release; CI reads the tag, the code reads this constant.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__version__ = "1.2.1"
|
__version__ = "1.2.4"
|
||||||
GITHUB_REPO = "Engelgardt23/dhcpsrv"
|
REPO = "engel/dhcpsrv" # self-hosted Gitea (git.engelgardt23.ru)
|
||||||
|
|||||||
+8
-4
@@ -11,7 +11,7 @@ from rich.console import Console
|
|||||||
from rich.prompt import Confirm, Prompt
|
from rich.prompt import Confirm, Prompt
|
||||||
from rich.table import Table
|
from rich.table import Table
|
||||||
|
|
||||||
from . import __version__, GITHUB_REPO
|
from . import __version__, REPO
|
||||||
from .platform_win import enable_vt, require_admin
|
from .platform_win import enable_vt, require_admin
|
||||||
from .update_check import check_for_update
|
from .update_check import check_for_update
|
||||||
from .network import list_adapters, set_static_ip, revert_to_dhcp
|
from .network import list_adapters, set_static_ip, revert_to_dhcp
|
||||||
@@ -21,7 +21,7 @@ from .config import load_config
|
|||||||
from .i18n import set_language, t
|
from .i18n import set_language, t
|
||||||
|
|
||||||
|
|
||||||
def _select_nic(console: Console) -> dict | None:
|
def _select_nic(console: Console, auto_single: bool = True) -> dict | None:
|
||||||
console.rule(f"[bold cyan]{t('available_adapters')}")
|
console.rule(f"[bold cyan]{t('available_adapters')}")
|
||||||
adapters = list_adapters()
|
adapters = list_adapters()
|
||||||
if not adapters:
|
if not adapters:
|
||||||
@@ -30,6 +30,10 @@ def _select_nic(console: Console) -> dict | None:
|
|||||||
for i, a in enumerate(adapters, 1):
|
for i, a in enumerate(adapters, 1):
|
||||||
ip = a.get("IPv4") or "—"
|
ip = a.get("IPv4") or "—"
|
||||||
console.print(f" {i}) [{a['Status']}] {a['Name']} ({a['Description']}) {ip}")
|
console.print(f" {i}) [{a['Status']}] {a['Name']} ({a['Description']}) {ip}")
|
||||||
|
if auto_single and len(adapters) == 1:
|
||||||
|
only = adapters[0]
|
||||||
|
console.print(f"[green]{t('only_adapter', name=only['Name'])}[/]")
|
||||||
|
return only
|
||||||
while True:
|
while True:
|
||||||
s = Prompt.ask(t("select_adapter")).strip()
|
s = Prompt.ask(t("select_adapter")).strip()
|
||||||
if s.isdigit() and 1 <= int(s) <= len(adapters):
|
if s.isdigit() and 1 <= int(s) <= len(adapters):
|
||||||
@@ -53,7 +57,7 @@ def main() -> None:
|
|||||||
title = f"[bold cyan]dhcpsrv v{__version__}[/] {t('tagline')}"
|
title = f"[bold cyan]dhcpsrv v{__version__}[/] {t('tagline')}"
|
||||||
latest = check_for_update()
|
latest = check_for_update()
|
||||||
if latest:
|
if latest:
|
||||||
release_url = f"https://github.com/{GITHUB_REPO}/releases/latest"
|
release_url = f"https://git.engelgardt23.ru/{REPO}/releases/latest"
|
||||||
notice = t("update_available", tag=latest)
|
notice = t("update_available", tag=latest)
|
||||||
header = Table.grid(expand=True)
|
header = Table.grid(expand=True)
|
||||||
header.add_column(justify="left", ratio=1)
|
header.add_column(justify="left", ratio=1)
|
||||||
@@ -64,7 +68,7 @@ def main() -> None:
|
|||||||
console.print(title)
|
console.print(title)
|
||||||
console.print()
|
console.print()
|
||||||
|
|
||||||
nic = _select_nic(console)
|
nic = _select_nic(console, cfg_data.get("auto_select_single", True))
|
||||||
if not nic:
|
if not nic:
|
||||||
input(t("press_enter")); return
|
input(t("press_enter")); return
|
||||||
|
|
||||||
|
|||||||
+37
-10
@@ -20,16 +20,25 @@ CONFIG_HEADER = """\
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# dhcpsrv configuration
|
# dhcpsrv configuration
|
||||||
#
|
#
|
||||||
# To change the interface language, edit the 'language' value below.
|
# language : interface language. Valid: en, ru
|
||||||
# Valid values: en, ru
|
# auto_select_single : auto-pick the network adapter when only one is found,
|
||||||
|
# without asking (yes/no).
|
||||||
#
|
#
|
||||||
# Чтобы сменить язык интерфейса, измените значение 'language' ниже.
|
# language : язык интерфейса. Допустимо: en, ru
|
||||||
# Допустимые значения: en, ru
|
# auto_select_single : автоматически выбирать сетевой адаптер, если он
|
||||||
|
# единственный, не спрашивая (yes/no).
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
def _to_bool(s: str, default: bool) -> bool:
|
||||||
|
s = (s or "").strip().lower()
|
||||||
|
if s in ("yes", "true", "y", "1", "on"): return True
|
||||||
|
if s in ("no", "false", "n", "0", "off"): return False
|
||||||
|
return default
|
||||||
|
|
||||||
|
|
||||||
def app_dir() -> Path:
|
def app_dir() -> Path:
|
||||||
"""Directory holding the running executable (or source folder when run via python)."""
|
"""Directory holding the running executable (or source folder when run via python)."""
|
||||||
if getattr(sys, "frozen", False):
|
if getattr(sys, "frozen", False):
|
||||||
@@ -60,10 +69,26 @@ def _ask_language() -> str:
|
|||||||
print("Please enter 1 or 2 / Введите 1 или 2")
|
print("Please enter 1 or 2 / Введите 1 или 2")
|
||||||
|
|
||||||
|
|
||||||
def _write_config(lang: str) -> None:
|
def _ask_auto_select() -> bool:
|
||||||
|
"""First-run prompt — auto-select a lone adapter? Bilingual stdin."""
|
||||||
|
print()
|
||||||
|
print("Auto-select the network adapter when only one is found? (y/n)")
|
||||||
|
print("Автовыбор сетевого адаптера, если он единственный? (y/n)")
|
||||||
|
while True:
|
||||||
|
try:
|
||||||
|
c = input("> ").strip().lower()
|
||||||
|
except (EOFError, KeyboardInterrupt):
|
||||||
|
return True
|
||||||
|
if c in ("y", "yes", "д", "да", "1"): return True
|
||||||
|
if c in ("n", "no", "н", "нет", "0"): return False
|
||||||
|
print("y / n")
|
||||||
|
|
||||||
|
|
||||||
|
def _write_config(lang: str, auto_select: bool) -> None:
|
||||||
path = config_path()
|
path = config_path()
|
||||||
cp = configparser.ConfigParser()
|
cp = configparser.ConfigParser()
|
||||||
cp["General"] = {"language": lang}
|
cp["General"] = {"language": lang,
|
||||||
|
"auto_select_single": "yes" if auto_select else "no"}
|
||||||
with path.open("w", encoding="utf-8") as f:
|
with path.open("w", encoding="utf-8") as f:
|
||||||
f.write(CONFIG_HEADER)
|
f.write(CONFIG_HEADER)
|
||||||
cp.write(f)
|
cp.write(f)
|
||||||
@@ -75,20 +100,22 @@ def load_config() -> dict:
|
|||||||
path = config_path()
|
path = config_path()
|
||||||
if not path.exists():
|
if not path.exists():
|
||||||
lang = _ask_language()
|
lang = _ask_language()
|
||||||
|
auto = _ask_auto_select()
|
||||||
try:
|
try:
|
||||||
_write_config(lang)
|
_write_config(lang, auto)
|
||||||
except OSError:
|
except OSError:
|
||||||
# read-only location — fall back to in-memory default
|
# read-only location — fall back to in-memory default
|
||||||
pass
|
pass
|
||||||
return {"language": lang}
|
return {"language": lang, "auto_select_single": auto}
|
||||||
|
|
||||||
cp = configparser.ConfigParser()
|
cp = configparser.ConfigParser()
|
||||||
try:
|
try:
|
||||||
cp.read(path, encoding="utf-8")
|
cp.read(path, encoding="utf-8")
|
||||||
except (configparser.Error, OSError):
|
except (configparser.Error, OSError):
|
||||||
return {"language": DEFAULT_LANG}
|
return {"language": DEFAULT_LANG, "auto_select_single": True}
|
||||||
|
|
||||||
lang = (cp.get("General", "language", fallback=DEFAULT_LANG) or DEFAULT_LANG).strip().lower()
|
lang = (cp.get("General", "language", fallback=DEFAULT_LANG) or DEFAULT_LANG).strip().lower()
|
||||||
if lang not in SUPPORTED_LANGS:
|
if lang not in SUPPORTED_LANGS:
|
||||||
lang = DEFAULT_LANG
|
lang = DEFAULT_LANG
|
||||||
return {"language": lang}
|
auto = _to_bool(cp.get("General", "auto_select_single", fallback="yes"), True)
|
||||||
|
return {"language": lang, "auto_select_single": auto}
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ from typing import Callable, Optional
|
|||||||
|
|
||||||
from .network import ping_one
|
from .network import ping_one
|
||||||
from .i18n import t as _t
|
from .i18n import t as _t
|
||||||
|
from .leases import write_leases
|
||||||
|
|
||||||
|
|
||||||
# ---------- helpers ----------
|
# ---------- helpers ----------
|
||||||
@@ -147,6 +148,23 @@ class DhcpServer:
|
|||||||
o += bytes([255])
|
o += bytes([255])
|
||||||
return bytes(pkt) + bytes(o)
|
return bytes(pkt) + bytes(o)
|
||||||
|
|
||||||
|
# --- lease-table export (contract for sibling tools, e.g. vrcx) ---
|
||||||
|
def export_leases(self) -> None:
|
||||||
|
"""Snapshot the lease table to the shared JSON file. Best-effort."""
|
||||||
|
with self.lock:
|
||||||
|
leases = [
|
||||||
|
{
|
||||||
|
"ip": int2ip(c["ip_int"]),
|
||||||
|
"mac": mac,
|
||||||
|
"host": c.get("host", ""),
|
||||||
|
"ping_ok": bool(c.get("ping_ok")),
|
||||||
|
"last": c.get("last", ""),
|
||||||
|
}
|
||||||
|
for mac, c in self.clients.items()
|
||||||
|
if c.get("ip_int")
|
||||||
|
]
|
||||||
|
write_leases(self.cfg.server_ip, leases, now_s())
|
||||||
|
|
||||||
# --- ping loop, runs in its own thread ---
|
# --- ping loop, runs in its own thread ---
|
||||||
def ping_loop(self, stop: threading.Event) -> None:
|
def ping_loop(self, stop: threading.Event) -> None:
|
||||||
from concurrent.futures import ThreadPoolExecutor
|
from concurrent.futures import ThreadPoolExecutor
|
||||||
@@ -166,6 +184,8 @@ class DhcpServer:
|
|||||||
changed = True
|
changed = True
|
||||||
if changed:
|
if changed:
|
||||||
self.on_change()
|
self.on_change()
|
||||||
|
# Refresh the export every tick so its mtime reflects liveness.
|
||||||
|
self.export_leases()
|
||||||
|
|
||||||
# --- main server loop ---
|
# --- main server loop ---
|
||||||
def run(self, stop: threading.Event) -> None:
|
def run(self, stop: threading.Event) -> None:
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ STRINGS: dict[str, dict[str, str]] = {
|
|||||||
"update_available": "Update available ({tag})",
|
"update_available": "Update available ({tag})",
|
||||||
"available_adapters": "Available adapters",
|
"available_adapters": "Available adapters",
|
||||||
"no_adapters": "No suitable wired adapters found.",
|
"no_adapters": "No suitable wired adapters found.",
|
||||||
|
"only_adapter": "Only one adapter, auto-selected: {name}",
|
||||||
"select_adapter": "Select adapter number",
|
"select_adapter": "Select adapter number",
|
||||||
"invalid_selection": "Invalid selection.",
|
"invalid_selection": "Invalid selection.",
|
||||||
"press_enter": "Press Enter to exit",
|
"press_enter": "Press Enter to exit",
|
||||||
@@ -60,6 +61,7 @@ STRINGS: dict[str, dict[str, str]] = {
|
|||||||
"update_available": "Доступно обновление ({tag})",
|
"update_available": "Доступно обновление ({tag})",
|
||||||
"available_adapters": "Доступные адаптеры",
|
"available_adapters": "Доступные адаптеры",
|
||||||
"no_adapters": "Подходящие проводные адаптеры не найдены.",
|
"no_adapters": "Подходящие проводные адаптеры не найдены.",
|
||||||
|
"only_adapter": "Адаптер один, выбран автоматически: {name}",
|
||||||
"select_adapter": "Введите номер адаптера",
|
"select_adapter": "Введите номер адаптера",
|
||||||
"invalid_selection": "Неверный выбор.",
|
"invalid_selection": "Неверный выбор.",
|
||||||
"press_enter": "Нажмите Enter для выхода",
|
"press_enter": "Нажмите Enter для выхода",
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
"""
|
||||||
|
Lease-table export — the shared contract with sibling tools (e.g. vrcx).
|
||||||
|
|
||||||
|
dhcpsrv owns the DHCP state; other tools must NOT reach into it. Instead we
|
||||||
|
periodically dump a small, self-describing JSON snapshot to a fixed,
|
||||||
|
tool-neutral location. Consumers read that file (and judge its freshness by
|
||||||
|
the file mtime). No shared code, no network call between the tools.
|
||||||
|
|
||||||
|
Default location: %PROGRAMDATA%\\vegman\\leases.json (override via the
|
||||||
|
VEGMAN_LEASES env var). The directory is created on first write.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import tempfile
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
SCHEMA = 1
|
||||||
|
|
||||||
|
|
||||||
|
def leases_path() -> Path:
|
||||||
|
override = os.environ.get("VEGMAN_LEASES")
|
||||||
|
if override:
|
||||||
|
return Path(override)
|
||||||
|
base = os.environ.get("PROGRAMDATA") or os.environ.get("LOCALAPPDATA") or "."
|
||||||
|
return Path(base) / "vegman" / "leases.json"
|
||||||
|
|
||||||
|
|
||||||
|
def write_leases(server_ip: str, leases: list[dict], updated: str) -> None:
|
||||||
|
"""Atomically write the snapshot. Best-effort: swallow I/O errors so a
|
||||||
|
read-only/locked target can never disturb the DHCP service."""
|
||||||
|
path = leases_path()
|
||||||
|
payload = {
|
||||||
|
"schema": SCHEMA,
|
||||||
|
"server_ip": server_ip,
|
||||||
|
"updated": updated,
|
||||||
|
"leases": leases,
|
||||||
|
}
|
||||||
|
try:
|
||||||
|
path.parent.mkdir(parents=True, exist_ok=True)
|
||||||
|
fd, tmp = tempfile.mkstemp(dir=str(path.parent), prefix=".leases-", suffix=".tmp")
|
||||||
|
try:
|
||||||
|
with os.fdopen(fd, "w", encoding="utf-8") as f:
|
||||||
|
json.dump(payload, f, ensure_ascii=False)
|
||||||
|
os.replace(tmp, path)
|
||||||
|
finally:
|
||||||
|
if os.path.exists(tmp):
|
||||||
|
os.remove(tmp)
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
@@ -1,16 +1,16 @@
|
|||||||
"""
|
"""
|
||||||
Auto-update check.
|
Auto-update check.
|
||||||
|
|
||||||
On startup, ask GitHub for the latest release tag. If it's newer than the
|
On startup, ask the Gitea instance for the latest release tag. If it's newer
|
||||||
local `__version__`, return the tag string so the caller can show a quiet
|
than the local `__version__`, return the tag string so the caller can show a
|
||||||
hint in the header. Silent on any error (offline, rate-limit, etc.).
|
quiet hint in the header. Silent on any error (offline, rate-limit, etc.).
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
import json
|
import json
|
||||||
import urllib.request
|
import urllib.request
|
||||||
|
|
||||||
from . import __version__, GITHUB_REPO
|
from . import __version__, REPO
|
||||||
|
|
||||||
|
|
||||||
def _parse_version(s: str) -> tuple[int, int, int]:
|
def _parse_version(s: str) -> tuple[int, int, int]:
|
||||||
@@ -29,9 +29,8 @@ def check_for_update() -> str | None:
|
|||||||
currently running version. Returns None when up to date, offline, or on
|
currently running version. Returns None when up to date, offline, or on
|
||||||
any error — the caller decides how (or whether) to render the hint."""
|
any error — the caller decides how (or whether) to render the hint."""
|
||||||
try:
|
try:
|
||||||
url = f"https://api.github.com/repos/{GITHUB_REPO}/releases/latest"
|
url = f"https://git.engelgardt23.ru/api/v1/repos/{REPO}/releases/latest"
|
||||||
req = urllib.request.Request(url, headers={
|
req = urllib.request.Request(url, headers={
|
||||||
"Accept": "application/vnd.github+json",
|
|
||||||
"User-Agent": f"dhcpsrv/{__version__}",
|
"User-Agent": f"dhcpsrv/{__version__}",
|
||||||
})
|
})
|
||||||
with urllib.request.urlopen(req, timeout=3) as r:
|
with urllib.request.urlopen(req, timeout=3) as r:
|
||||||
|
|||||||
Reference in New Issue
Block a user