Skip to content

Commit 0d03250

Browse files
GyulyVGCGyulyVGC
committed
fix merge conflicts with main
2 parents 639a257 + abffd73 commit 0d03250

62 files changed

Lines changed: 1938 additions & 882 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.all-contributorsrc‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,96 @@
975975
"contributions": [
976976
"ideas"
977977
]
978+
},
979+
{
980+
"login": "golanbenoni",
981+
"name": "golanbenoni",
982+
"avatar_url": "https://avatars.githubusercontent.com/u/108551998?v=4",
983+
"profile": "https://github.com/golanbenoni",
984+
"contributions": [
985+
"financial"
986+
]
987+
},
988+
{
989+
"login": "pml68",
990+
"name": "Polesznyák Márk László",
991+
"avatar_url": "https://avatars.githubusercontent.com/u/116908301?v=4",
992+
"profile": "http://pml68.dev",
993+
"contributions": [
994+
"translation"
995+
]
996+
},
997+
{
998+
"login": "Hurdadd",
999+
"name": "Hurdad Ashouri",
1000+
"avatar_url": "https://avatars.githubusercontent.com/u/197808737?v=4",
1001+
"profile": "https://github.com/Hurdadd",
1002+
"contributions": [
1003+
"translation"
1004+
]
1005+
},
1006+
{
1007+
"login": "EfesX",
1008+
"name": "Ivan Guzhba",
1009+
"avatar_url": "https://avatars.githubusercontent.com/u/24487499?v=4",
1010+
"profile": "https://github.com/EfesX",
1011+
"contributions": [
1012+
"translation"
1013+
]
1014+
},
1015+
{
1016+
"login": "thambaru",
1017+
"name": "Thambaru Wijesekara",
1018+
"avatar_url": "https://avatars.githubusercontent.com/u/4795173?v=4",
1019+
"profile": "https://thambaru.com",
1020+
"contributions": [
1021+
"translation"
1022+
]
1023+
},
1024+
{
1025+
"login": "orbisai0security",
1026+
"name": "OrbisAI Security",
1027+
"avatar_url": "https://avatars.githubusercontent.com/u/242526317?v=4",
1028+
"profile": "https://orbisappsec.com/",
1029+
"contributions": [
1030+
"security"
1031+
]
1032+
},
1033+
{
1034+
"login": "coderabbitai",
1035+
"name": "CodeRabbit",
1036+
"avatar_url": "https://avatars.githubusercontent.com/u/132028505?v=4",
1037+
"profile": "https://www.coderabbit.ai/?utm_source=cr_org&utm_medium=github",
1038+
"contributions": [
1039+
"financial"
1040+
]
1041+
},
1042+
{
1043+
"login": "toboil-features",
1044+
"name": "toboil-features",
1045+
"avatar_url": "https://avatars.githubusercontent.com/u/160222185?v=4",
1046+
"profile": "https://github.com/toboil-features",
1047+
"contributions": [
1048+
"platform"
1049+
]
1050+
},
1051+
{
1052+
"login": "ethical-buddy",
1053+
"name": "suryansh deshwal",
1054+
"avatar_url": "https://avatars.githubusercontent.com/u/169056304?v=4",
1055+
"profile": "https://suryansh-deshwal.vercel.app/",
1056+
"contributions": [
1057+
"code"
1058+
]
1059+
},
1060+
{
1061+
"login": "karpovantonme",
1062+
"name": "Anton Karpov",
1063+
"avatar_url": "https://avatars.githubusercontent.com/u/30812217?v=4",
1064+
"profile": "http://karpovanton.com",
1065+
"contributions": [
1066+
"code"
1067+
]
9781068
}
9791069
],
9801070
"contributorsPerLine": 7,

‎.design/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ for this reason implementing an optimal UI for the application is crucially impo
4141

4242
## 🚀 The Main Product
4343

44-
Sniffnet can be downloaded from [here](https://sniffnet.net/download/).
44+
Sniffnet can be downloaded from [here](https://sniffnet.app/download/).
4545

4646
### Target audience
4747

‎.github/dependabot.yml‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,31 @@ updates:
1010
- package-ecosystem: "github-actions"
1111
directory: "/"
1212
schedule:
13-
interval: "daily"
14-
13+
interval: "weekly"
14+
cooldown:
15+
default-days: 7
16+
ignore:
17+
# Major-pinned actions: only surface major updates.
18+
- dependency-name: "actions/*"
19+
update-types: ["version-update:semver-minor", "version-update:semver-patch"]
20+
- dependency-name: "codecov/codecov-action"
21+
update-types: ["version-update:semver-minor", "version-update:semver-patch"]
22+
- dependency-name: "github/codeql-action"
23+
update-types: ["version-update:semver-minor", "version-update:semver-patch"]
24+
groups:
25+
# Bundle all action updates into a single PR to review at once
26+
github-actions:
27+
patterns: ["*"]
28+
1529
# Maintain dependencies for cargo
1630
- package-ecosystem: cargo
1731
directory: "/"
1832
schedule:
19-
interval: "daily"
33+
interval: "weekly"
2034
target-branch: "main"
35+
cooldown:
36+
default-days: 7
37+
groups:
38+
# Bundle all cargo updates into a single PR to review at once
39+
cargo:
40+
patterns: ["*"]

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@v6
32+
uses: actions/checkout@v7
3333

3434
- name: Initialize CodeQL
3535
uses: github/codeql-action/init@v4

‎.github/workflows/crates.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
permissions:
1010
contents: read
1111
steps:
12-
- uses: actions/checkout@v6
12+
- uses: actions/checkout@v7
1313
- uses: dtolnay/rust-toolchain@stable
1414

1515
- name: Publish to crates.io

‎.github/workflows/docker.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
packages: write
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v6
15+
uses: actions/checkout@v7
1616

1717
- name: Extract version from Cargo.toml
1818
id: cargo-version
@@ -29,20 +29,20 @@ jobs:
2929
fi
3030
3131
- name: Set up QEMU
32-
uses: docker/setup-qemu-action@v4
32+
uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
3333

3434
- name: Set up Docker Buildx
35-
uses: docker/setup-buildx-action@v4
35+
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
3636

3737
- name: Login to GitHub Container Registry
38-
uses: docker/login-action@v4
38+
uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
3939
with:
4040
registry: ghcr.io
4141
username: GyulyVGC
4242
password: ${{ secrets.GITHUB_TOKEN }}
4343

4444
- name: Build and push
45-
uses: docker/build-push-action@v7
45+
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
4646
with:
4747
context: .
4848
platforms: linux/amd64

‎.github/workflows/package.yml‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ jobs:
4444

4545
steps:
4646
- name: Checkout repository
47-
uses: actions/checkout@v6
47+
uses: actions/checkout@v7
4848

4949
- name: Install Linux dependencies
5050
if: matrix.os == 'ubuntu'
51-
run: sudo apt-get update -y && sudo apt-get install -y libpcap-dev libasound2-dev libgtk-3-dev
51+
run: sudo apt-get update -y && sudo apt-get install -y libpcap-dev libasound2-dev
5252

5353
- name: Install Windows dependencies
5454
if: matrix.os == 'windows'
@@ -58,7 +58,7 @@ jobs:
5858
run: |
5959
Write-Host "::group::Npcap SDK"
6060
$ARCH = "${{ matrix.arch }}"
61-
Invoke-WebRequest -Uri "https://npcap.com/dist/npcap-sdk-1.13.zip" -OutFile "$env:TEMP\npcap-sdk.zip" -Verbose
61+
Invoke-WebRequest -Uri "https://npcap.com/dist/npcap-sdk-1.16.zip" -OutFile "$env:TEMP\npcap-sdk.zip" -Verbose
6262
Expand-Archive -LiteralPath "$env:TEMP\npcap-sdk.zip" -DestinationPath "$env:TEMP\npcap-sdk" -Verbose
6363
$LibPath = switch ($ARCH)
6464
{
@@ -86,6 +86,11 @@ jobs:
8686
- name: Clippy (release mode)
8787
run: cargo clippy --release -- -D warnings
8888

89+
# needed to make latency tests succeed
90+
- name: Enable unprivileged ICMP (Linux)
91+
if: matrix.os == 'ubuntu'
92+
run: sudo sysctl -w net.ipv4.ping_group_range="0 2147483647"
93+
8994
- name: Test (release mode)
9095
if: matrix.os == 'macos' || matrix.os == 'ubuntu' || matrix.os == 'windows' && matrix.arch == 'amd64'
9196
run: |
@@ -98,7 +103,18 @@ jobs:
98103

99104
- name: Build binary (Linux)
100105
if: matrix.os == 'ubuntu'
101-
run: cross build --release --target ${{ matrix.target }}
106+
# alsa-sys and fontconfig-sys use pkg-config to locate their C libs, but the 0.2.5
107+
# cross image doesn't pre-configure pkg-config for cross-compilation: point it at the
108+
# target arch's .pc files (installed by the Cross.toml pre-build) and allow cross lookups
109+
env:
110+
PKG_CONFIG_ALLOW_CROSS: "1"
111+
run: |
112+
case "${{ matrix.arch }}" in
113+
i386) export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ;;
114+
armhf) export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig ;;
115+
arm64) export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig ;;
116+
esac
117+
cross build --release --target ${{ matrix.target }}
102118
103119
- name: Build binary (macOS/Windows)
104120
if: matrix.os == 'macos' || matrix.os == 'windows'
@@ -133,7 +149,7 @@ jobs:
133149

134150
steps:
135151
- name: Checkout repository
136-
uses: actions/checkout@v6
152+
uses: actions/checkout@v7
137153

138154
- name: Install dependencies
139155
run: apt-get update -y && apt-get install -y curl build-essential
@@ -186,7 +202,7 @@ jobs:
186202

187203
steps:
188204
- name: Checkout repository
189-
uses: actions/checkout@v6
205+
uses: actions/checkout@v7
190206

191207
- name: Install dependencies
192208
run: apt-get update -y && apt-get install -y git build-essential graphicsmagick-imagemagick-compat wget file desktop-file-utils libfuse2
@@ -240,7 +256,7 @@ jobs:
240256

241257
steps:
242258
- name: Checkout repository
243-
uses: actions/checkout@v6
259+
uses: actions/checkout@v7
244260

245261
- name: Install dependencies
246262
run: dnf update -y && dnf install -y @development-tools patchelf
@@ -287,7 +303,7 @@ jobs:
287303

288304
steps:
289305
- name: Checkout repository
290-
uses: actions/checkout@v6
306+
uses: actions/checkout@v7
291307

292308
- name: Install Rust
293309
uses: dtolnay/rust-toolchain@stable
@@ -353,7 +369,7 @@ jobs:
353369

354370
steps:
355371
- name: Checkout repository
356-
uses: actions/checkout@v6
372+
uses: actions/checkout@v7
357373

358374
- name: Install dependencies
359375
shell: powershell
@@ -395,7 +411,7 @@ jobs:
395411
if-no-files-found: error
396412

397413
- name: Sign package artifacts
398-
uses: signpath/github-action-submit-signing-request@v2.2
414+
uses: signpath/github-action-submit-signing-request@b9d91eadd323de506c0c81cf0c7fe7438f3360fd # v2.2
399415
with:
400416
api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
401417
organization-id: '3b533e02-73c3-4908-a018-d09a34498a6a'

‎.github/workflows/rust.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ jobs:
3535
- os: windows
3636

3737
steps:
38-
- uses: actions/checkout@v6
38+
- uses: actions/checkout@v7
3939
- uses: dtolnay/rust-toolchain@stable
4040
with:
4141
components: rustfmt, clippy
4242

4343
- name: Install Linux dependencies
4444
if: matrix.os == 'ubuntu'
45-
run: sudo apt-get update -y && sudo apt-get install -y libpcap-dev libasound2-dev libgtk-3-dev
45+
run: sudo apt-get update -y && sudo apt-get install -y libpcap-dev libasound2-dev
4646

4747
- name: Install Windows dependencies
4848
if: matrix.os == 'windows' && github.event_name != 'pull_request'
4949
run: |
50-
Invoke-WebRequest -Uri "https://npcap.com/dist/npcap-sdk-1.13.zip" -OutFile "C:/npcap-sdk.zip"
50+
Invoke-WebRequest -Uri "https://npcap.com/dist/npcap-sdk-1.16.zip" -OutFile "C:/npcap-sdk.zip"
5151
Expand-Archive -LiteralPath C:/npcap-sdk.zip -DestinationPath C:/npcap-sdk
5252
echo "LIB=C:/npcap-sdk/Lib/x64" >> $env:GITHUB_ENV
5353
Invoke-WebRequest -Uri ${{secrets.NPCAP_OEM_URL}} -OutFile C:/npcap-oem.exe
@@ -64,6 +64,11 @@ jobs:
6464
if: matrix.os != 'windows' || github.event_name != 'pull_request'
6565
run: cargo clippy -- -D warnings
6666

67+
# needed to make latency tests succeed
68+
- name: Enable unprivileged ICMP (Linux)
69+
if: matrix.os == 'ubuntu'
70+
run: sudo sysctl -w net.ipv4.ping_group_range="0 2147483647"
71+
6772
- name: test
6873
if: matrix.os != 'windows' || github.event_name != 'pull_request'
6974
run: cargo test --verbose -- --nocapture

‎.well-known/funding-manifest-urls‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://sniffnet.net/funding.json
1+
https://sniffnet.app/funding.json

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@
33
All Sniffnet releases with the relative changes are documented in this file.
44

55
## [UNRELEASED]
6+
- Set `Content-Type: application/json` header on remote notifications ([#1266](https://github.com/GyulyVGC/sniffnet/pull/1266))
7+
8+
## [1.5.1] - 2026-07-22
9+
- Show latency of connections ([#1194](https://github.com/GyulyVGC/sniffnet/pull/1194) — fixes [#845](https://github.com/GyulyVGC/sniffnet/issues/845))
10+
- Added Hungarian translation 🇭🇺 ([#1197](https://github.com/GyulyVGC/sniffnet/pull/1197))
11+
- Added Sinhala translation 🇱🇰 ([#1239](https://github.com/GyulyVGC/sniffnet/pull/1239))
612
- Support CIDR ranges in imported IP blacklists ([#1181](https://github.com/GyulyVGC/sniffnet/pull/1181))
713
- Show number of IP addresses and CIDR ranges in imported IP blacklists ([#1183](https://github.com/GyulyVGC/sniffnet/pull/1183))
14+
- Add relevant keywords to the `.desktop` file ([#1248](https://github.com/GyulyVGC/sniffnet/pull/1248))
815
- Updated some of the existing translations to v1.5:
916
- Ukrainian ([#1039](https://github.com/GyulyVGC/sniffnet/pull/1039))
1017
- German ([#1122](https://github.com/GyulyVGC/sniffnet/pull/1122))
@@ -13,8 +20,12 @@ All Sniffnet releases with the relative changes are documented in this file.
1320
- Indonesian ([#1145](https://github.com/GyulyVGC/sniffnet/pull/1145))
1421
- Swedish ([#1068](https://github.com/GyulyVGC/sniffnet/pull/1068))
1522
- Greek ([#1175](https://github.com/GyulyVGC/sniffnet/pull/1175))
23+
- Persian ([#1196](https://github.com/GyulyVGC/sniffnet/pull/1196))
24+
- Russian ([#1224](https://github.com/GyulyVGC/sniffnet/pull/1224))
25+
- Use a thread pool for reverse DNS lookups to avoid stalling hosts resolutions (fixes [#1257](https://github.com/GyulyVGC/sniffnet/issues/1257))
1626
- Fix unseen hosts and services not appearing dimmed in thumbnail mode (fixes [#1142](https://github.com/GyulyVGC/sniffnet/issues/1142))
1727
- Fix `X-AppImage-Version` field in Linux AppImage metadata to correctly reflect the app version ([#1174](https://github.com/GyulyVGC/sniffnet/pull/1174) — fixes [#1003](https://github.com/GyulyVGC/sniffnet/issues/1003))
28+
- Fix Linux packages failing to run on distros with `glibc` older than 2.39 (fixes [#1256](https://github.com/GyulyVGC/sniffnet/issues/1256))
1829

1930
## [1.5.0] - 2026-04-14
2031
- Show which apps and programs are generating network traffic ([#1056](https://github.com/GyulyVGC/sniffnet/pull/1056) — fixes [#170](https://github.com/GyulyVGC/sniffnet/issues/170))

0 commit comments

Comments
 (0)