Rename server-start.* to start.*, add sniff-start.bat
- git mv server-start.sh -> start.sh, server-start.bat -> start.bat - Add Windows sniff-start.bat mirroring sniff-start.sh options - Update usage comments and PWA help text references - Bump 1.22.17, SW cache v48->v49
This commit is contained in:
1 parent
c7b87cb587
commit
ed7e99d671
8 files changed
+86
-9
No files matched your search
+3
-3
@@ -2583,7 +2583,7 @@ async function checkConnection() {
|
|||||||
<code>git clone https://github.com/anttro/simtrace2-pysniff.git</code><br>
|
<code>git clone https://github.com/anttro/simtrace2-pysniff.git</code><br>
|
||||||
<code>cd simtrace2-pysniff && pip install -e .</code></li>
|
<code>cd simtrace2-pysniff && pip install -e .</code></li>
|
||||||
<li>${t('Start the server in direct mode (recommended):')}<br>
|
<li>${t('Start the server in direct mode (recommended):')}<br>
|
||||||
<code>./server-start.sh --capture direct</code><br>
|
<code>./start.sh --capture direct</code><br>
|
||||||
<span style="color:var(--text-muted);">${t('Requires SIMtrace2 hardware connected via USB; captures directly from the device.')}</span></li>
|
<span style="color:var(--text-muted);">${t('Requires SIMtrace2 hardware connected via USB; captures directly from the device.')}</span></li>
|
||||||
</ol>
|
</ol>
|
||||||
<p style="margin-top:8px;">${t('Then set the URL above to http://127.0.0.1:8081 and return to the Trace tab.')}</p>
|
<p style="margin-top:8px;">${t('Then set the URL above to http://127.0.0.1:8081 and return to the Trace tab.')}</p>
|
||||||
@@ -2591,7 +2591,7 @@ async function checkConnection() {
|
|||||||
<p style="color:var(--text-muted); margin-top:4px;">${t('Use an external sniffer alongside the server. This mode is compatible with the original Osmocom simtrace2-sniff.')}</p>
|
<p style="color:var(--text-muted); margin-top:4px;">${t('Use an external sniffer alongside the server. This mode is compatible with the original Osmocom simtrace2-sniff.')}</p>
|
||||||
<ol style="margin-top:4px;">
|
<ol style="margin-top:4px;">
|
||||||
<li>${t('Start the server:')}<br>
|
<li>${t('Start the server:')}<br>
|
||||||
<code>./server-start.sh --capture gsmtap</code></li>
|
<code>./start.sh --capture gsmtap</code></li>
|
||||||
<li>${t('Start a GSMTAP source in another terminal — either:')}<br>
|
<li>${t('Start a GSMTAP source in another terminal — either:')}<br>
|
||||||
<code>./sniff-start.sh --gsmtap 127.0.0.1</code> (simtrace2-pysniff)<br>
|
<code>./sniff-start.sh --gsmtap 127.0.0.1</code> (simtrace2-pysniff)<br>
|
||||||
or<br>
|
or<br>
|
||||||
@@ -2625,7 +2625,7 @@ function onFilterChange() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ──────────────────── Versioning ────────────────────
|
// ──────────────────── Versioning ────────────────────
|
||||||
const PWA_VERSION = '1.22.16';
|
const PWA_VERSION = '1.22.17';
|
||||||
const MIN_SERVER_VERSION = '1.0.0';
|
const MIN_SERVER_VERSION = '1.0.0';
|
||||||
|
|
||||||
function parseVersion(v) {
|
function parseVersion(v) {
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
const CACHE = 'simtrace-analyser-v48';
|
const CACHE = 'simtrace-analyser-v49';
|
||||||
|
|
||||||
const PRECACHE = [
|
const PRECACHE = [
|
||||||
'index.html',
|
'index.html',
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ build-backend = "setuptools.backends._legacy:_Backend"
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "simtrace2-pysniff"
|
name = "simtrace2-pysniff"
|
||||||
version = "1.22.16"
|
version = "1.22.17"
|
||||||
description = "Python-based sniffing tool for SIMtrace2 hardware (SIM card communication sniffer)"
|
description = "Python-based sniffing tool for SIMtrace2 hardware (SIM card communication sniffer)"
|
||||||
readme = {file = "README.md", content-type = "text/markdown"}
|
readme = {file = "README.md", content-type = "text/markdown"}
|
||||||
license = {text = "GPL-2.0-or-later"}
|
license = {text = "GPL-2.0-or-later"}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ from .gsmtap import GsmtapSender, GsmtapReceiver
|
|||||||
from .pcap import PcapWriter
|
from .pcap import PcapWriter
|
||||||
from .dump import FileDumper, format_message
|
from .dump import FileDumper, format_message
|
||||||
|
|
||||||
__version__ = '1.22.16'
|
__version__ = '1.22.17'
|
||||||
__all__ = [
|
__all__ = [
|
||||||
'SniffSession',
|
'SniffSession',
|
||||||
'DeviceDisconnected',
|
'DeviceDisconnected',
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
@echo off
|
||||||
|
setlocal enabledelayedexpansion
|
||||||
|
|
||||||
|
:: simtrace2-pysniff startup script for Windows
|
||||||
|
::
|
||||||
|
:: Usage: sniff-start.bat [--format FORMAT] [--gsmtap HOST[:PORT]] [--pcap FILE] [--output FILE] [--inactivity-timeout SECONDS]
|
||||||
|
::
|
||||||
|
:: Options set via environment variables act as defaults; CLI flags override them.
|
||||||
|
|
||||||
|
set "GSMTAP=%GSMTAP%"
|
||||||
|
set "PCAP=%PCAP%"
|
||||||
|
set "OUTPUT=%OUTPUT%"
|
||||||
|
set "FORMAT=%FORMAT%"
|
||||||
|
set "INACTIVITY_TIMEOUT=%INACTIVITY_TIMEOUT%"
|
||||||
|
if "%INACTIVITY_TIMEOUT%"=="" set "INACTIVITY_TIMEOUT=0"
|
||||||
|
set "EXTRA_ARGS="
|
||||||
|
|
||||||
|
:parse_args
|
||||||
|
if "%~1"=="" goto :run
|
||||||
|
if "%~1"=="--gsmtap" (
|
||||||
|
set "GSMTAP=%~2"
|
||||||
|
shift
|
||||||
|
shift
|
||||||
|
goto :parse_args
|
||||||
|
)
|
||||||
|
if "%~1"=="--pcap" (
|
||||||
|
set "PCAP=%~2"
|
||||||
|
shift
|
||||||
|
shift
|
||||||
|
goto :parse_args
|
||||||
|
)
|
||||||
|
if "%~1"=="--output" (
|
||||||
|
set "OUTPUT=%~2"
|
||||||
|
shift
|
||||||
|
shift
|
||||||
|
goto :parse_args
|
||||||
|
)
|
||||||
|
if "%~1"=="-o" (
|
||||||
|
set "OUTPUT=%~2"
|
||||||
|
shift
|
||||||
|
shift
|
||||||
|
goto :parse_args
|
||||||
|
)
|
||||||
|
if "%~1"=="--format" (
|
||||||
|
set "FORMAT=%~2"
|
||||||
|
shift
|
||||||
|
shift
|
||||||
|
goto :parse_args
|
||||||
|
)
|
||||||
|
if "%~1"=="-f" (
|
||||||
|
set "FORMAT=%~2"
|
||||||
|
shift
|
||||||
|
shift
|
||||||
|
goto :parse_args
|
||||||
|
)
|
||||||
|
if "%~1"=="--inactivity-timeout" (
|
||||||
|
set "INACTIVITY_TIMEOUT=%~2"
|
||||||
|
shift
|
||||||
|
shift
|
||||||
|
goto :parse_args
|
||||||
|
)
|
||||||
|
set "EXTRA_ARGS=!EXTRA_ARGS! %~1"
|
||||||
|
shift
|
||||||
|
goto :parse_args
|
||||||
|
|
||||||
|
:run
|
||||||
|
echo Starting simtrace2-pysniff...
|
||||||
|
|
||||||
|
set "ARGS="
|
||||||
|
if not "%GSMTAP%"=="" set "ARGS=!ARGS! --gsmtap %GSMTAP%"
|
||||||
|
if not "%PCAP%"=="" set "ARGS=!ARGS! --pcap %PCAP%"
|
||||||
|
if not "%OUTPUT%"=="" set "ARGS=!ARGS! --output %OUTPUT%"
|
||||||
|
if not "%FORMAT%"=="" set "ARGS=!ARGS! --format %FORMAT%"
|
||||||
|
if not "%INACTIVITY_TIMEOUT%"=="0" set "ARGS=!ARGS! --inactivity-timeout %INACTIVITY_TIMEOUT%"
|
||||||
|
|
||||||
|
set "PYTHONPATH=%~dp0"
|
||||||
|
python -m simtrace2_pysniff %ARGS% %EXTRA_ARGS%
|
||||||
@@ -3,7 +3,7 @@ setlocal enabledelayedexpansion
|
|||||||
|
|
||||||
:: simtrace2-pysniff-server startup script for Windows
|
:: simtrace2-pysniff-server startup script for Windows
|
||||||
::
|
::
|
||||||
:: Usage: server-start.bat [--capture gsmtap|direct] [--port PORT] [--db PATH] [--gsmtap-port PORT]
|
:: Usage: start.bat [--capture gsmtap|direct] [--port PORT] [--db PATH] [--gsmtap-port PORT]
|
||||||
::
|
::
|
||||||
:: Options set via environment variables act as defaults; CLI flags override them.
|
:: Options set via environment variables act as defaults; CLI flags override them.
|
||||||
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# simtrace2-pysniff-server startup script
|
# simtrace2-pysniff-server startup script
|
||||||
#
|
#
|
||||||
# Usage: ./server-start.sh [--capture gsmtap|direct] [--port PORT] [--db PATH] [--gsmtap-port PORT]
|
# Usage: ./start.sh [--capture gsmtap|direct] [--port PORT] [--db PATH] [--gsmtap-port PORT]
|
||||||
#
|
#
|
||||||
# Options set via environment variables act as defaults; CLI flags override them.
|
# Options set via environment variables act as defaults; CLI flags override them.
|
||||||
|
|
||||||
@@ -224,7 +224,7 @@ class TestImportEndpoint(unittest.TestCase):
|
|||||||
class TestVersion(unittest.TestCase):
|
class TestVersion(unittest.TestCase):
|
||||||
def test_package_version(self):
|
def test_package_version(self):
|
||||||
from simtrace2_pysniff import __version__
|
from simtrace2_pysniff import __version__
|
||||||
self.assertEqual(__version__, '1.22.16')
|
self.assertEqual(__version__, '1.22.17')
|
||||||
|
|
||||||
def test_status_includes_version(self):
|
def test_status_includes_version(self):
|
||||||
import os
|
import os
|
||||||
|
|||||||
Reference in new issue
Block a user