fix: bind physical SIMs and validate multi-arch images

fix: support PLMN 234-10 IMS registration

.github/ISSUE_TEMPLATE/issue_report.yml

@@ -1,75 +0,0 @@
-name: Issue Report
-description: Report a bug or problem with VoCat. Please answer every question below.
-title: "[Issue]: "
-labels: ["triage"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to open an issue. Please fill in all the fields
-        below so we can triage and handle your report as quickly as possible.
-
-  - type: checkboxes
-    id: searched-existing
-    attributes:
-      label: Existing Issues
-      description: Have you searched through past Issues (both open and closed) to check whether this problem, or a similar one, has already been reported?
-      options:
-        - label: I have searched past Issues and found no similar report.
-          required: true
-
-  - type: textarea
-    id: description
-    attributes:
-      label: What happened?
-      description: Describe the problem you encountered and what you expected to happen instead.
-      placeholder: A clear and concise description of the issue...
-    validations:
-      required: true
-
-  - type: dropdown
-    id: priority
-    attributes:
-      label: Suggested Priority
-      description: In your opinion, what priority should this issue be handled with?
-      options:
-        - Low
-        - Medium
-        - High
-    validations:
-      required: true
-
-  - type: dropdown
-    id: area
-    attributes:
-      label: Affected Area
-      description: Do you think this is a frontend or backend error?
-      options:
-        - Frontend
-        - Backend
-        - Not sure
-    validations:
-      required: true
-
-  - type: checkboxes
-    id: abuse-mcc-acknowledgement
-    attributes:
-      label: Acknowledgement
-      description: Please read and confirm the following before submitting.
-      options:
-        - label: >-
-            I understand that this repository will not modify any feature code on
-            behalf of abusers in order to enable abuse, and that this service must
-            not be used in regions with MCC=460; any issues
-            arising from such use will not be resolved.
-          required: true
-
-  - type: textarea
-    id: error-messages
-    attributes:
-      label: Error Messages
-      description: Did you encounter any error messages? If so, please paste them here.
-      placeholder: Paste any relevant error output or logs...
-      render: shell
-    validations:
-      required: false

.github/workflows/pr-size-limit.yml

@@ -1,282 +0,0 @@
-name: Pull request size limit
-
-on:
-  pull_request_target:
-    branches:
-      - master
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-
-permissions:
-  contents: read
-  pull-requests: write
-  issues: write
-
-concurrency:
-  group: pr-size-limit-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
-
-jobs:
-  enforce-size-limit:
-    # 保持这个名字不变，这样你 Ruleset 里的 Required Check 不需要修改
-    name: Enforce 5,000-line limit
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-
-    env:
-      MAX_CHANGED_LINES: "5000"
-      PR_NUMBER: ${{ github.event.pull_request.number }}
-      BASE_REF: ${{ github.event.pull_request.base.ref }}
-      GH_TOKEN: ${{ github.token }}
-
-    steps:
-      - name: Checkout trusted base repository
-        uses: actions/checkout@v7
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Check conflicts and pull request size
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          echo "Checking PR #${PR_NUMBER}"
-          echo "Base branch: ${BASE_REF}"
-
-          ############################################################
-          # Helper: comment on and close rejected PR
-          ############################################################
-
-          reject_pr() {
-            local message="$1"
-
-            echo "::error::${message}"
-
-            COMMENT_PAYLOAD="$(
-              jq -nc \
-                --arg body "${message}" \
-                '{body: $body}'
-            )"
-
-            echo "Posting rejection comment..."
-
-            curl \
-              --fail-with-body \
-              --silent \
-              --show-error \
-              --request POST \
-              --header "Accept: application/vnd.github+json" \
-              --header "Authorization: Bearer ${GH_TOKEN}" \
-              --header "X-GitHub-Api-Version: 2022-11-28" \
-              "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments" \
-              --data "${COMMENT_PAYLOAD}" \
-              >/dev/null
-
-            echo "Closing PR #${PR_NUMBER}..."
-
-            curl \
-              --fail-with-body \
-              --silent \
-              --show-error \
-              --request PATCH \
-              --header "Accept: application/vnd.github+json" \
-              --header "Authorization: Bearer ${GH_TOKEN}" \
-              --header "X-GitHub-Api-Version: 2022-11-28" \
-              "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}" \
-              --data '{"state":"closed"}' \
-              >/dev/null
-
-            exit 1
-          }
-
-          ############################################################
-          # Fetch target branch and PR HEAD
-          ############################################################
-
-          echo "Fetching base branch and PR head..."
-
-          git fetch --no-tags --force origin \
-            "+refs/heads/${BASE_REF}:refs/remotes/origin/base-pr-check" \
-            "+refs/pull/${PR_NUMBER}/head:refs/remotes/origin/pr-${PR_NUMBER}"
-
-          BASE_COMMIT="$(
-            git rev-parse refs/remotes/origin/base-pr-check
-          )"
-
-          PR_COMMIT="$(
-            git rev-parse refs/remotes/origin/pr-${PR_NUMBER}
-          )"
-
-          echo "Base commit: ${BASE_COMMIT}"
-          echo "PR commit:   ${PR_COMMIT}"
-
-          ############################################################
-          # STEP 1: Reject PRs with merge conflicts
-          ############################################################
-
-          echo
-          echo "Checking for merge conflicts..."
-
-          set +e
-
-          git merge-tree \
-            --write-tree \
-            --quiet \
-            "${BASE_COMMIT}" \
-            "${PR_COMMIT}"
-
-          MERGE_STATUS=$?
-
-          set -e
-
-          if [[ "${MERGE_STATUS}" -eq 1 ]]; then
-
-            {
-              echo "### Pull request policy"
-              echo
-              echo "- Merge conflicts: ❌ Detected"
-              echo "- Result: Rejected"
-            } >> "${GITHUB_STEP_SUMMARY}"
-
-            reject_pr "This pull request has merge conflicts with the current master branch and cannot be accepted. Please update your branch with the latest master, resolve all merge conflicts locally, and submit a conflict-free pull request."
-
-          elif [[ "${MERGE_STATUS}" -ne 0 ]]; then
-
-            echo "::error::Unable to determine whether the pull request can be merged."
-            echo "git merge-tree returned status ${MERGE_STATUS}."
-
-            {
-              echo "### Pull request policy"
-              echo
-              echo "- Merge conflict check: ⚠️ Error"
-              echo "- Result: Check failed"
-            } >> "${GITHUB_STEP_SUMMARY}"
-
-            exit 1
-
-          fi
-
-          echo "No merge conflicts detected."
-
-          ############################################################
-          # STEP 2: Determine merge base
-          ############################################################
-
-          if ! MERGE_BASE="$(
-            git merge-base "${BASE_COMMIT}" "${PR_COMMIT}"
-          )"; then
-
-            echo "::error::Unable to determine merge base."
-
-            {
-              echo "### Pull request policy"
-              echo
-              echo "- Merge conflicts: ✅ None"
-              echo "- Diff calculation: ⚠️ Failed"
-            } >> "${GITHUB_STEP_SUMMARY}"
-
-            exit 1
-
-          fi
-
-          echo "Merge base: ${MERGE_BASE}"
-
-          ############################################################
-          # STEP 3: Calculate actual PR changed lines
-          ############################################################
-
-          NUMSTAT_FILE="$(mktemp)"
-
-          git diff \
-            --no-ext-diff \
-            --no-textconv \
-            --numstat \
-            "${MERGE_BASE}" \
-            "${PR_COMMIT}" \
-            > "${NUMSTAT_FILE}"
-
-          ADDITIONS="$(
-            awk '
-              $1 ~ /^[0-9]+$/ {
-                total += $1
-              }
-
-              END {
-                print total + 0
-              }
-            ' "${NUMSTAT_FILE}"
-          )"
-
-          DELETIONS="$(
-            awk '
-              $2 ~ /^[0-9]+$/ {
-                total += $2
-              }
-
-              END {
-                print total + 0
-              }
-            ' "${NUMSTAT_FILE}"
-          )"
-
-          CHANGED_FILES="$(
-            awk '
-              END {
-                print NR + 0
-              }
-            ' "${NUMSTAT_FILE}"
-          )"
-
-          CHANGED_LINES=$((ADDITIONS + DELETIONS))
-
-          ############################################################
-          # Action summary
-          ############################################################
-
-          {
-            echo "### Pull request policy"
-            echo
-            echo "- Merge conflicts: ✅ None"
-            echo "- Changed files: ${CHANGED_FILES}"
-            echo "- Additions: ${ADDITIONS}"
-            echo "- Deletions: ${DELETIONS}"
-            echo "- Total changed lines: ${CHANGED_LINES}"
-            echo "- Maximum allowed: ${MAX_CHANGED_LINES}"
-          } >> "${GITHUB_STEP_SUMMARY}"
-
-          echo
-          echo "Changed files: ${CHANGED_FILES}"
-          echo "Additions: ${ADDITIONS}"
-          echo "Deletions: ${DELETIONS}"
-          echo "Total changed lines: ${CHANGED_LINES}"
-          echo "Limit: ${MAX_CHANGED_LINES}"
-
-          ############################################################
-          # STEP 4: Reject oversized PRs
-          ############################################################
-
-          if (( CHANGED_LINES > MAX_CHANGED_LINES )); then
-
-            reject_pr "This pull request changes ${CHANGED_LINES} lines (${ADDITIONS} additions + ${DELETIONS} deletions) across ${CHANGED_FILES} files, exceeding the repository limit of ${MAX_CHANGED_LINES} changed lines. It has been closed automatically. Please split the changes into smaller pull requests."
-
-          fi
-
-          ############################################################
-          # PASS
-          ############################################################
-
-          echo
-          echo "Pull request passed all policy checks."
-          echo "No merge conflicts."
-          echo "Changed lines: ${CHANGED_LINES}/${MAX_CHANGED_LINES}."
-
-          {
-            echo
-            echo "### Result"
-            echo
-            echo "✅ Pull request passed."
-          } >> "${GITHUB_STEP_SUMMARY}"

.gitignore

@@ -10,7 +10,6 @@
 *.dll
 *.so
 *.dylib
-/fix
 
 # ---- Cookie / secret files (NEVER commit) ----
 vc.jar

Dockerfile

@@ -36,7 +36,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build \
 
 # ---- Stage 3: minimal runtime ----
 FROM alpine:3.20
-RUN apk add --no-cache ca-certificates ccid iproute2 pcsc-lite tzdata && \
+RUN apk add --no-cache ca-certificates ccid pcsc-lite tzdata && \
     addgroup -S -g 1000 vocat && \
     adduser -S -D -H -u 1000 -G vocat vocat
 

LICENSES/quectel-qmi-go-MIT.txt

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2026 iniwex5
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

NOTICE

@@ -1,10 +0,0 @@
-VoCat uses the following Go module for native Qualcomm QMI support:
-
-  github.com/iniwex5/quectel-qmi-go v0.6.0
-  Distribution: https://proxy.golang.org/github.com/iniwex5/quectel-qmi-go/@v/v0.6.0.zip
-  Documentation and license metadata: https://pkg.go.dev/github.com/iniwex5/[email protected]
-  License: MIT
-  Copyright: Copyright (c) 2026 iniwex5
-
-The full MIT license text is included in:
-LICENSES/quectel-qmi-go-MIT.txt

cmd/vocat/bootstrap_admin.go

@@ -23,14 +23,14 @@ func runBootstrapAdmin(args []string) error {
 	if err := flags.Parse(args); err != nil || flags.NArg() != 0 {
 		return errors.New("usage: vocat bootstrap-admin [--database path] [--username name]")
 	}
-	reader := bufio.NewReader(os.Stdin)
+	reader := bufio.NewReader(io.LimitReader(os.Stdin, 2049))
 	password, err := reader.ReadString('\n')
 	if err != nil && !errors.Is(err, io.EOF) {
 		return fmt.Errorf("read password: %w", err)
 	}
 	password = strings.TrimSuffix(strings.TrimSuffix(password, "\n"), "\r")
-	if password == "" {
-		return errors.New("bootstrap password cannot be empty")
+	if len(password) < 12 || len(password) > 1024 {
+		return errors.New("bootstrap password must contain between 12 and 1024 characters")
 	}
 	adminUsername := strings.TrimSpace(*username)
 	if len(adminUsername) < 1 || len(adminUsername) > 64 || strings.ContainsAny(adminUsername, "\r\n\t") {

cmd/vocat/install_script_test.go

@@ -1,31 +0,0 @@
-package main
-
-import (
-	"os"
-	"strings"
-	"testing"
-)
-
-func TestInstallerValidatesDatabaseBeforeReplacingBinary(t *testing.T) {
-	scriptBytes, err := os.ReadFile("../../scripts/install.sh")
-	if err != nil {
-		t.Fatal(err)
-	}
-	script := string(scriptBytes)
-	mainStart := strings.LastIndex(script, "# --- Main ")
-	if mainStart < 0 {
-		t.Fatal("installer main section not found")
-	}
-	main := script[mainStart:]
-	validateAt := strings.Index(main, `bootstrap_admin "${VOCAT_TMP}/vocat"`)
-	installAt := strings.Index(main, "install_binary")
-	if validateAt < 0 {
-		t.Fatal("installer does not validate the database with the downloaded binary")
-	}
-	if installAt < 0 {
-		t.Fatal("installer does not install the downloaded binary")
-	}
-	if validateAt > installAt {
-		t.Fatal("installer replaces the current binary before validating database compatibility")
-	}
-}

cmd/vocat/main.go

@@ -27,7 +27,6 @@ import (
 	"vocat/internal/extensions"
 	"vocat/internal/httpsmode"
 	"vocat/internal/loghub"
-	"vocat/internal/modem"
 	"vocat/internal/pcsc"
 	"vocat/internal/server"
 	"vocat/internal/store"
@@ -192,7 +191,7 @@ func run(logger *slog.Logger, logs *loghub.Hub) error {
 	}
 
 	cardReaders := pcsc.New()
-	deviceManager, err := device.NewManager(device.Options{CardReaders: cardReaders, Logger: logger})
+	deviceManager, err := device.NewManager(device.Options{CardReaders: cardReaders})
 	if err != nil {
 		return fmt.Errorf("create device manager: %w", err)
 	}
@@ -581,13 +580,6 @@ func configureVoWiFiRuntime(
 	if err != nil {
 		return nil, err
 	}
-	nativeQMIAdapter, err := vowifi.NewNativeQMIAdapter(nativeQMIControllerMapper{Mapper: mapper, Devices: deviceManager}, func(deviceID string) bool {
-		deviceConfig, configErr := database.Device(context.Background(), deviceID)
-		return configErr == nil && deviceConfig.VoWiFiEnabled
-	})
-	if err != nil {
-		return nil, err
-	}
 	pcscAdapter, err := vowifi.NewPCSCAdapter(cardReaders, func(ctx context.Context, deviceID string) (pcsc.Selector, string, error) {
 		config, resolveErr := database.Device(ctx, strings.TrimSpace(deviceID))
 		if resolveErr != nil {
@@ -613,10 +605,8 @@ func configureVoWiFiRuntime(
 			adapter := vowifiDeviceAdapter(ec20Adapter)
 			if deviceConfig.DeviceType == store.DeviceTypeUSBSIMReader {
 				adapter = pcscAdapter
-			} else if deviceConfig.DeviceType == store.DeviceTypeWiFi410 {
-				adapter = nativeQMIAdapter
 			}
-			return newVoWiFiOrchestrator(deviceConfig, database, adapter, logger)
+			return newVoWiFiOrchestrator(deviceConfig, database, adapter)
 		},
 	})
 
@@ -715,7 +705,6 @@ func newVoWiFiOrchestrator(
 	deviceConfig store.Device,
 	database *store.Store,
 	adapter vowifiDeviceAdapter,
-	logger *slog.Logger,
 ) (*vowifi.Orchestrator, error) {
 	apn := deviceConfig.APN
 	if apn == "" {
@@ -726,7 +715,6 @@ func newVoWiFiOrchestrator(
 		return nil, fmt.Errorf("device %q IKE provider: %w", deviceConfig.ID, err)
 	}
 	imsProvider, err := ims.NewProvider(adapter, ims.Config{
-		Logger: logger,
 		// The userspace SWu data plane carries protected P-CSCF signalling over
 		// TCP by default. UK PLMN 234-10 exposes its P-CSCF over UDP/5060 on SWu.
 		Transport: "tcp",
@@ -734,14 +722,9 @@ func newVoWiFiOrchestrator(
 			"23410":  "udp",
 			"234010": "udp",
 		},
-		// Some UK SIM profiles leave EF_SMSP/AT+CSCA empty. Keep fallbacks scoped
-		// to their HPLMN so an O2/giffgaff SIM can never inherit Vodafone's SMSC.
-		SMSCenterByPLMN: map[string]string{
-			"23410":  "+447802000332",
-			"234010": "+447802000332",
-			"23415":  "+447785016005",
-			"234015": "+447785016005",
-		},
+		// Some Vodafone UK SIM profiles leave AT+CSCA empty; Vodafone publishes
+		// this service-centre number for manual SMS setup.
+		SMSCenter: "+447785016005",
 		OnSMS: func(ctx context.Context, message ims.ReceivedSMS) error {
 			extra, _ := json.Marshal(map[string]any{
 				"transport":                "ims",
@@ -853,9 +836,9 @@ func provisionDiscoveredDevices(
 	}
 	for _, discovered := range manager.List() {
 		candidate := discovered.Candidate
-		deviceType := provisionedDeviceType(candidate)
 		backend := "at"
 		control := candidate.ATPort.OpenPath()
+		deviceType := store.DeviceTypePCIeEC20EC25
 		esimTransport := backend
 		if candidate.QMIControl != "" {
 			backend = "qmi"
@@ -872,7 +855,6 @@ func provisionDiscoveredDevices(
 		if name == "" || strings.EqualFold(name, "Android") {
 			name = "Quectel EC20 / EC25"
 		}
-		supportsSMS := deviceType != store.DeviceTypeWiFi410
 		if err := database.UpsertDevice(ctx, store.Device{
 			ID:             discovered.ID,
 			Name:           name,
@@ -889,7 +871,7 @@ func provisionDiscoveredDevices(
 			DeviceBackend:  backend,
 			ESIMTransport:  esimTransport,
 			NetworkEnabled: false,
-			SMSEnabled:     supportsSMS,
+			SMSEnabled:     true,
 			VoWiFiEnabled:  true,
 		}); err != nil {
 			return err
@@ -898,15 +880,6 @@ func provisionDiscoveredDevices(
 	return nil
 }
 
-func provisionedDeviceType(candidate modem.Candidate) string {
-	controlName := filepath.Base(filepath.Clean(candidate.QMIControl))
-	if candidate.HardwareKind == "wwan" &&
-		strings.HasPrefix(controlName, "wwan") && strings.Contains(controlName, "qmi") {
-		return store.DeviceTypeWiFi410
-	}
-	return store.DeviceTypePCIeEC20EC25
-}
-
 // persistLogsToStore subscribes to the live log hub and durably appends every
 // entry to the log_events table, so runtime logs survive restarts and can be
 // pruned by the configured retention policy.

cmd/vocat/main_test.go

@@ -217,24 +217,3 @@ func TestEnforceCardRegionIgnoresUnknownOrNotReadySIM(t *testing.T) {
 		t.Fatalf("expected no card policies, got %d", len(policies))
 	}
 }
-
-func TestProvisionedDeviceTypeRecognizesNativeWWAN(t *testing.T) {
-	native := modem.Candidate{
-		HardwareKind: "wwan",
-		USBPath:      "/sys/devices/pci0000:00/0000:00:00.0/wwan/wwan0",
-		QMIControl:   "/dev/wwan0qmi0",
-		ATPort:       modem.Port{Path: "/dev/wwan0at0"},
-	}
-	if got := provisionedDeviceType(native); got != store.DeviceTypeWiFi410 {
-		t.Fatalf("native WWAN type = %q, want %q", got, store.DeviceTypeWiFi410)
-	}
-
-	usb := modem.Candidate{
-		USBPath:    "/sys/bus/usb/devices/1-6",
-		QMIControl: "/dev/cdc-wdm0",
-		ATPort:     modem.Port{Path: "/dev/ttyUSB2"},
-	}
-	if got := provisionedDeviceType(usb); got != store.DeviceTypePCIeEC20EC25 {
-		t.Fatalf("USB modem type = %q, want %q", got, store.DeviceTypePCIeEC20EC25)
-	}
-}

cmd/vocat/menu.go

@@ -88,7 +88,7 @@ func menuEnvFilePath() string {
 	return envFilePath
 }
 
-// runMenu is the interactive lifecycle menu: toggle language, reset credentials,
+// runMenu is the interactive lifecycle menu: toggle language, change password,
 // change the Web listener port, restart the systemd unit, self-update, or fully
 // uninstall vocat. It must run as root on the host (needs systemctl + the 0600
 // env file). Docker deployments do not use it.
@@ -128,7 +128,7 @@ func runMenu(logger *slog.Logger) error {
 				fmt.Println(menu.errorPrefix(err))
 			}
 		case "2":
-			if err := menuResetAdminCredentials(reader, menu); err != nil {
+			if err := menuChangePassword(reader, menu); err != nil {
 				fmt.Println(menu.errorPrefix(err))
 			}
 		case "3":
@@ -193,12 +193,13 @@ func loadMenuLanguage() (string, error) {
 	return "en", nil
 }
 
-func menuResetAdminCredentials(reader *bufio.Reader, m *menu) error {
+func menuChangePassword(reader *bufio.Reader, m *menu) error {
 	cfg, err := config.Load()
 	if err != nil {
 		return fmt.Errorf("%w: %v", errMenuConfig, err)
 	}
-	ctx := context.Background()
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
 
 	database, err := store.Open(ctx, cfg.DatabasePath)
 	if err != nil {
@@ -214,14 +215,11 @@ func menuResetAdminCredentials(reader *bufio.Reader, m *menu) error {
 	if err != nil {
 		return fmt.Errorf("%w: %v", errMenuStore, err)
 	}
-	fmt.Print(m.newUsername(admin.Username))
-	username, err := reader.ReadString('\n')
+
+	fmt.Print(m.currentPassword())
+	currentPw, err := readPasswordMasked()
 	if err != nil {
-		return fmt.Errorf("read administrator username: %w", err)
-	}
-	username = strings.TrimSpace(username)
-	if username == "" {
-		username = admin.Username
+		return err
 	}
 	fmt.Print(m.newPassword())
 	newPw, err := readPasswordMasked()
@@ -237,7 +235,10 @@ func menuResetAdminCredentials(reader *bufio.Reader, m *menu) error {
 	if newPw != confirmPw {
 		return errPasswordsDiffer
 	}
-	if err := authService.ResetAdminCredentials(ctx, username, newPw); err != nil {
+	if err := authService.ChangePassword(ctx, admin.Username, currentPw, newPw); err != nil {
+		if errors.Is(err, auth.ErrInvalidCredentials) {
+			return errCurrentWrong
+		}
 		return fmt.Errorf("%w: %v", errMenuAuth, err)
 	}
 	fmt.Println(m.passwordChanged())
@@ -523,7 +524,6 @@ func menuUpdate(m *menu, logger *slog.Logger) error {
 	}
 	fmt.Println(m.updateChecking())
 	if err := update.Run(logger, []string{"--repo", repo}); err != nil {
-		logger.Error("menu update failed", "error", err)
 		return fmt.Errorf("%w: %v", errUpdateFailed, err)
 	}
 	return nil
@@ -563,6 +563,7 @@ func menuUninstall(reader *bufio.Reader, m *menu) error {
 
 // menu-local sentinel errors so callers can map them to localized messages.
 var (
+	errCurrentWrong       = errors.New("menu: current password is incorrect")
 	errPasswordsDiffer    = errors.New("menu: passwords do not match")
 	errNoSystemctl        = errors.New("menu: systemctl not found")
 	errRestartFailed      = errors.New("menu: restart failed")
@@ -587,17 +588,17 @@ func (m *menu) msg(key string) string {
 	table := map[string][2]string{
 		"title":               {"vocat 管理菜单", "vocat management menu"},
 		"opt_lang":            {"1) 切换中英文", "1) Toggle language"},
-		"opt_change":          {"2) 修改账号密码", "2) Change admin credentials"},
+		"opt_change":          {"2) 修改账号密码", "2) Change admin password"},
 		"opt_port":            {"3) 修改 Web 监听端口", "3) Change Web listening port"},
 		"opt_restart":         {"4) 重启软件", "4) Restart software"},
 		"opt_update":          {"5) 更新软件", "5) Update software"},
 		"opt_uninstall":       {"0) 卸载软件", "0) Uninstall software"},
 		"prompt":              {"请选择: ", "Select: "},
 		"invalid":             {"无效选项，请重试。按 Ctrl+C 退出。", "Invalid choice, try again. Press Ctrl+C to exit."},
-		"new_username":        {"新用户名（直接回车保留 %s）: ", "New username (Enter to keep %s): "},
-		"new_pw":              {"新密码: ", "New password: "},
+		"cur_pw":              {"当前密码: ", "Current password: "},
+		"new_pw":              {"新密码 (至少 12 位): ", "New password (min 12 chars): "},
 		"confirm_pw":          {"确认新密码: ", "Confirm new password: "},
-		"pw_changed":          {"管理员账号密码已修改，现有 Web 会话已退出。", "Administrator credentials changed; existing Web sessions were signed out."},
+		"pw_changed":          {"密码已修改。重启后仍然有效。", "Password changed. Survives restart."},
 		"current_web_address": {"当前 Web 监听地址: %s", "Current Web listening address: %s"},
 		"new_web_port":        {"新端口 (1-65535，直接回车取消，当前 %s): ", "New port (1-65535, Enter to cancel, current %s): "},
 		"web_port_cancelled":  {"已取消修改端口。", "Web port change cancelled."},
@@ -631,12 +632,10 @@ func (m *menu) msg(key string) string {
 	return entry[zh]
 }
 
-func (m *menu) title() string   { return m.msg("title") }
-func (m *menu) prompt() string  { return m.msg("prompt") }
-func (m *menu) invalid() string { return m.msg("invalid") }
-func (m *menu) newUsername(current string) string {
-	return fmt.Sprintf(m.msg("new_username"), current)
-}
+func (m *menu) title() string           { return m.msg("title") }
+func (m *menu) prompt() string          { return m.msg("prompt") }
+func (m *menu) invalid() string         { return m.msg("invalid") }
+func (m *menu) currentPassword() string { return m.msg("cur_pw") }
 func (m *menu) newPassword() string     { return m.msg("new_pw") }
 func (m *menu) confirmPassword() string { return m.msg("confirm_pw") }
 func (m *menu) passwordChanged() string { return m.msg("pw_changed") }
@@ -671,6 +670,11 @@ func (m *menu) options() []string {
 
 func (m *menu) errorPrefix(err error) string {
 	switch {
+	case errors.Is(err, errCurrentWrong):
+		if m.lang == "en" {
+			return "Current password is incorrect."
+		}
+		return "当前密码不正确。"
 	case errors.Is(err, errPasswordsDiffer):
 		if m.lang == "en" {
 			return "Passwords do not match."
@@ -687,11 +691,10 @@ func (m *menu) errorPrefix(err error) string {
 		}
 		return "重启失败。"
 	case errors.Is(err, errUpdateFailed):
-		detail := strings.TrimPrefix(err.Error(), errUpdateFailed.Error()+": ")
 		if m.lang == "en" {
-			return "Update failed: " + detail
+			return "Update failed."
 		}
-		return "更新失败: " + detail
+		return "更新失败。"
 	case errors.Is(err, errMenuConfig):
 		if m.lang == "en" {
 			return "Failed to load configuration."

cmd/vocat/menu_test.go

@@ -72,20 +72,3 @@ func TestMenuIncludesWebPortOptionInBothLanguages(t *testing.T) {
 		}
 	}
 }
-
-func TestMenuCredentialResetPromptsDoNotRequestCurrentPassword(t *testing.T) {
-	for _, lang := range []string{"zh", "en"} {
-		menu := newMenu(lang)
-		prompts := strings.Join([]string{
-			menu.newUsername("admin"),
-			menu.newPassword(),
-			menu.confirmPassword(),
-		}, "\n")
-		if strings.Contains(strings.ToLower(prompts), "current password") || strings.Contains(prompts, "当前密码") {
-			t.Fatalf("%s credential reset still requests the current password: %q", lang, prompts)
-		}
-		if !strings.Contains(prompts, "admin") {
-			t.Fatalf("%s username prompt does not show the current username: %q", lang, prompts)
-		}
-	}
-}

cmd/vocat/native_qmi_vowifi.go

@@ -1,71 +0,0 @@
-package main
-
-import (
-	"context"
-
-	"vocat/internal/device"
-	"vocat/internal/vowifi/integration"
-)
-
-// nativeQMIControllerMapper keeps the configured Web/API device ID stable
-// while Linux exposes the physical MHI modem under its discovery ID.
-type nativeQMIControllerMapper struct {
-	Mapper  integration.ATMapper
-	Devices *device.Manager
-}
-
-func (mapper nativeQMIControllerMapper) physical(configuredID string) (string, error) {
-	entry, err := mapper.Mapper.Get(configuredID)
-	if err != nil {
-		return "", err
-	}
-	return entry.ID, nil
-}
-
-func (mapper nativeQMIControllerMapper) ReadNativeQMIIdentity(ctx context.Context, id string) (string, string, string, string, string, error) {
-	physical, err := mapper.physical(id)
-	if err != nil {
-		return "", "", "", "", "", err
-	}
-	return mapper.Devices.ReadNativeQMIIdentity(ctx, physical)
-}
-
-func (mapper nativeQMIControllerMapper) ProbeNativeQMIApplication(ctx context.Context, id, preference string) ([]byte, string, error) {
-	physical, err := mapper.physical(id)
-	if err != nil {
-		return nil, "", err
-	}
-	return mapper.Devices.ProbeNativeQMIApplication(ctx, physical, preference)
-}
-
-func (mapper nativeQMIControllerMapper) AuthenticateNativeQMI(ctx context.Context, id string, aid, apdu []byte) ([]byte, error) {
-	physical, err := mapper.physical(id)
-	if err != nil {
-		return nil, err
-	}
-	return mapper.Devices.AuthenticateNativeQMI(ctx, physical, aid, apdu)
-}
-
-func (mapper nativeQMIControllerMapper) NativeQMIRadioSnapshot(ctx context.Context, id string) (int, bool, error) {
-	physical, err := mapper.physical(id)
-	if err != nil {
-		return 0, false, err
-	}
-	return mapper.Devices.NativeQMIRadioSnapshot(ctx, physical)
-}
-
-func (mapper nativeQMIControllerMapper) StopNativeQMICellularData(ctx context.Context, id string) error {
-	physical, err := mapper.physical(id)
-	if err != nil {
-		return err
-	}
-	return mapper.Devices.StopNativeQMICellularData(ctx, physical)
-}
-
-func (mapper nativeQMIControllerMapper) SetNativeQMIRadioOff(ctx context.Context, id string, off bool) error {
-	physical, err := mapper.physical(id)
-	if err != nil {
-		return err
-	}
-	return mapper.Devices.SetNativeQMIRadioOff(ctx, physical, off)
-}

go.mod

@@ -4,7 +4,6 @@ go 1.25.0
 
 require (
 	github.com/coder/websocket v1.8.15
-	github.com/iniwex5/quectel-qmi-go v0.6.0
 	go.bug.st/serial v1.6.4
 	golang.org/x/crypto v0.52.0
 	golang.org/x/sys v0.47.0
@@ -19,8 +18,6 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/stretchr/testify v1.10.0 // indirect
-	github.com/warthog618/sms v0.3.0 // indirect
 	golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
 	modernc.org/libc v1.66.3 // indirect
 	modernc.org/mathutil v1.7.1 // indirect

go.sum

@@ -2,7 +2,6 @@ github.com/coder/websocket v1.8.15 h1:6B2JPeOGlpff2Uz6vOEH1Vzpi0iUz20A+lPVhPHtNU
 github.com/coder/websocket v1.8.15/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg=
 github.com/creack/goselect v0.1.2 h1:2DNy14+JPjRBgPzAd1thbQp4BSIihxcBf0IXhQXDRa0=
 github.com/creack/goselect v0.1.2/go.mod h1:a/NhLweNvqIYMuxcMOuWY516Cimucms3DglDzQP3hKY=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
@@ -11,25 +10,16 @@ github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17k
 github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/iniwex5/quectel-qmi-go v0.6.0 h1:zWZc9jeNMy7+USFRBbfdShnjzSryyYnCw7NPw4ubaIg=
-github.com/iniwex5/quectel-qmi-go v0.6.0/go.mod h1:6AlSY+Yj4MqJOsZ8cNrq99AzT9MlaopADnJtSRiyAfE=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/warthog618/sms v0.3.0 h1:LYAb5ngmu2qjNExgji3B7xi2tIZ9+DsuE9pC5xs4wwc=
-github.com/warthog618/sms v0.3.0/go.mod h1:+bYZGeBxu003sxD5xhzsrIPBAjPBzTABsRTwSpd7ld4=
 go.bug.st/serial v1.6.4 h1:7FmqNPgVp3pu2Jz5PoPtbZ9jJO5gnEnZIvnI1lzve8A=
 go.bug.st/serial v1.6.4/go.mod h1:nofMJxTeNVny/m6+KaafC6vJGj3miwQZ6vW4BZUGJPI=
 golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988=
@@ -47,10 +37,6 @@ golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4=
 golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk=
 golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
 golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 modernc.org/cc/v4 v4.26.2 h1:991HMkLjJzYBIfha6ECZdjrIYz2/1ayr+FL8GN+CNzM=

internal/auth/service.go

@@ -1,7 +1,6 @@
 package auth
 
 import (
-	"bytes"
 	"context"
 	"crypto/rand"
 	"crypto/sha256"
@@ -21,13 +20,8 @@ var (
 	ErrInvalidCredentials = errors.New("invalid credentials")
 	ErrUnauthorized       = errors.New("unauthorized")
 	ErrInvalidCSRF        = errors.New("invalid csrf token")
-	ErrEmptyPassword      = errors.New("password cannot be empty")
 )
 
-const bcryptPasswordLimit = 72
-
-var longPasswordHashPrefix = []byte("$vocat-sha256$")
-
 type Options struct {
 	SessionTTL time.Duration
 	BcryptCost int
@@ -91,14 +85,14 @@ func (s *Service) EnsureAdmin(ctx context.Context, username string, password str
 	current, err := s.store.CurrentAdmin(ctx)
 	if err == nil &&
 		current.Username == username &&
-		comparePassword(current.PasswordHash, password) == nil {
+		bcrypt.CompareHashAndPassword(current.PasswordHash, []byte(password)) == nil {
 		return nil
 	}
 	if err != nil && !errors.Is(err, store.ErrNotFound) {
 		return fmt.Errorf("auth: read configured admin: %w", err)
 	}
 
-	passwordHash, err := hashPassword(password, s.bcryptCost)
+	passwordHash, err := bcrypt.GenerateFromPassword([]byte(password), s.bcryptCost)
 	if err != nil {
 		return fmt.Errorf("auth: hash admin password: %w", err)
 	}
@@ -124,34 +118,16 @@ func (s *Service) EnsureAdminIfMissing(ctx context.Context, username string, pas
 	return true, nil
 }
 
-// ResetAdminCredentials replaces the single administrator without requiring
-// the previous credentials. It is intended for trusted local recovery flows
-// such as the root-only management CLI. Store.SetAdmin atomically revokes all
-// existing sessions when the credentials change.
-func (s *Service) ResetAdminCredentials(ctx context.Context, username string, password string) error {
-	username = strings.TrimSpace(username)
-	if len(username) < 1 || len(username) > 64 || strings.ContainsAny(username, "\r\n\t") {
-		return errors.New("administrator username must contain between 1 and 64 characters without control whitespace")
-	}
-	if password == "" {
-		return ErrEmptyPassword
-	}
-	if err := s.EnsureAdmin(ctx, username, password); err != nil {
-		return fmt.Errorf("auth: reset administrator credentials: %w", err)
-	}
-	return nil
-}
-
 func (s *Service) Login(ctx context.Context, username string, password string) (Credentials, error) {
 	admin, err := s.store.AdminByUsername(ctx, strings.TrimSpace(username))
 	if errors.Is(err, store.ErrNotFound) {
-		_ = comparePassword(s.dummyHash, password)
+		_ = bcrypt.CompareHashAndPassword(s.dummyHash, []byte(password))
 		return Credentials{}, ErrInvalidCredentials
 	}
 	if err != nil {
 		return Credentials{}, fmt.Errorf("auth: find admin: %w", err)
 	}
-	if comparePassword(admin.PasswordHash, password) != nil {
+	if bcrypt.CompareHashAndPassword(admin.PasswordHash, []byte(password)) != nil {
 		return Credentials{}, ErrInvalidCredentials
 	}
 
@@ -290,24 +266,24 @@ func (s *Service) ChangePassword(
 	currentPassword string,
 	newPassword string,
 ) error {
-	if newPassword == "" {
-		return ErrEmptyPassword
+	if len(newPassword) < 12 || len(newPassword) > 1024 {
+		return errors.New("new password must contain between 12 and 1024 characters")
 	}
 	admin, err := s.store.AdminByUsername(ctx, strings.TrimSpace(username))
 	if errors.Is(err, store.ErrNotFound) {
-		_ = comparePassword(s.dummyHash, currentPassword)
+		_ = bcrypt.CompareHashAndPassword(s.dummyHash, []byte(currentPassword))
 		return ErrInvalidCredentials
 	}
 	if err != nil {
 		return fmt.Errorf("auth: find admin: %w", err)
 	}
-	if comparePassword(admin.PasswordHash, currentPassword) != nil {
+	if bcrypt.CompareHashAndPassword(admin.PasswordHash, []byte(currentPassword)) != nil {
 		return ErrInvalidCredentials
 	}
-	if comparePassword(admin.PasswordHash, newPassword) == nil {
+	if bcrypt.CompareHashAndPassword(admin.PasswordHash, []byte(newPassword)) == nil {
 		return errors.New("new password must differ from the current password")
 	}
-	passwordHash, err := hashPassword(newPassword, s.bcryptCost)
+	passwordHash, err := bcrypt.GenerateFromPassword([]byte(newPassword), s.bcryptCost)
 	if err != nil {
 		return fmt.Errorf("auth: hash new password: %w", err)
 	}
@@ -317,36 +293,6 @@ func (s *Service) ChangePassword(
 	return nil
 }
 
-// hashPassword keeps ordinary bcrypt hashes compatible with existing
-// installations. bcrypt rejects inputs longer than 72 bytes, so only longer
-// passwords use a tagged SHA-256 pre-hash before bcrypt.
-func hashPassword(password string, cost int) ([]byte, error) {
-	material := []byte(password)
-	longPassword := len(material) > bcryptPasswordLimit
-	if longPassword {
-		digest := sha256.Sum256(material)
-		material = digest[:]
-	}
-	passwordHash, err := bcrypt.GenerateFromPassword(material, cost)
-	if err != nil {
-		return nil, err
-	}
-	if !longPassword {
-		return passwordHash, nil
-	}
-	return append(append([]byte(nil), longPasswordHashPrefix...), passwordHash...), nil
-}
-
-func comparePassword(passwordHash []byte, password string) error {
-	material := []byte(password)
-	if bytes.HasPrefix(passwordHash, longPasswordHashPrefix) {
-		digest := sha256.Sum256(material)
-		material = digest[:]
-		passwordHash = passwordHash[len(longPasswordHashPrefix):]
-	}
-	return bcrypt.CompareHashAndPassword(passwordHash, material)
-}
-
 func randomToken() (string, error) {
 	buffer := make([]byte, 32)
 	if _, err := rand.Read(buffer); err != nil {

internal/auth/service_test.go

@@ -3,7 +3,6 @@ package auth
 import (
 	"context"
 	"errors"
-	"strings"
 	"testing"
 	"time"
 
@@ -98,73 +97,6 @@ func TestEnsureAdminRevokesSessionOnPasswordChange(t *testing.T) {
 	}
 }
 
-func TestResetAdminCredentialsChangesUsernameAndPasswordWithoutOldPassword(t *testing.T) {
-	ctx := context.Background()
-	service := newTestService(t)
-	credentials, err := service.Login(ctx, "admin", "correct-password")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := service.ResetAdminCredentials(ctx, "new-admin", "replacement-password"); err != nil {
-		t.Fatalf("ResetAdminCredentials() error = %v", err)
-	}
-	if _, err := service.Login(ctx, "admin", "correct-password"); !errors.Is(err, ErrInvalidCredentials) {
-		t.Fatalf("old credentials error = %v, want ErrInvalidCredentials", err)
-	}
-	if _, err := service.Login(ctx, "new-admin", "replacement-password"); err != nil {
-		t.Fatalf("new credentials login error = %v", err)
-	}
-	if _, err := service.Authenticate(ctx, credentials.SessionToken); !errors.Is(err, ErrUnauthorized) {
-		t.Fatalf("old session error = %v, want ErrUnauthorized", err)
-	}
-}
-
-func TestResetAdminCredentialsValidatesInput(t *testing.T) {
-	service := newTestService(t)
-	for _, test := range []struct {
-		name     string
-		username string
-		password string
-	}{
-		{name: "empty username", password: "replacement-password"},
-		{name: "control whitespace", username: "bad\tname", password: "replacement-password"},
-		{name: "empty password", username: "admin", password: ""},
-	} {
-		t.Run(test.name, func(t *testing.T) {
-			if err := service.ResetAdminCredentials(context.Background(), test.username, test.password); err == nil {
-				t.Fatal("ResetAdminCredentials() accepted invalid input")
-			}
-		})
-	}
-}
-
-func TestResetAdminCredentialsAcceptsPasswordsWithoutComplexityRules(t *testing.T) {
-	ctx := context.Background()
-	for _, password := range []string{"1", strings.Repeat("x", 256)} {
-		service := newTestService(t)
-		if err := service.ResetAdminCredentials(ctx, "admin", password); err != nil {
-			t.Fatalf("ResetAdminCredentials(%d-byte password) error = %v", len(password), err)
-		}
-		if _, err := service.Login(ctx, "admin", password); err != nil {
-			t.Fatalf("Login(%d-byte password) error = %v", len(password), err)
-		}
-	}
-}
-
-func TestChangePasswordAcceptsPasswordsWithoutComplexityRules(t *testing.T) {
-	ctx := context.Background()
-	for _, password := range []string{"1", strings.Repeat("long-password-", 32)} {
-		service := newTestService(t)
-		if err := service.ChangePassword(ctx, "admin", "correct-password", password); err != nil {
-			t.Fatalf("ChangePassword(%d-byte password) error = %v", len(password), err)
-		}
-		if _, err := service.Login(ctx, "admin", password); err != nil {
-			t.Fatalf("Login(%d-byte password) error = %v", len(password), err)
-		}
-	}
-}
-
 func TestEnsureAdminIfMissingDoesNotOverwriteChangedPassword(t *testing.T) {
 	ctx := context.Background()
 	service := newTestService(t)

internal/device/carrier_db.go

@@ -14,41 +14,7 @@ import (
 var carrierDatabaseJSON []byte
 
 type carrierDatabase struct {
-	Carriers  map[string][]string `json:"c"`
-	Countries map[string]string   `json:"i"`
-	Rules     []carrierRule       `json:"r"`
-}
-
-type carrierRule struct {
-	Name          string   `json:"n"`
-	PLMNs         []string `json:"m"`
-	IMSIPatterns  []string `json:"x"`
-	SPNs          []string `json:"s"`
-	GID1Prefixes  []string `json:"g1"`
-	GID2Prefixes  []string `json:"g2"`
-	ICCIDPrefixes []string `json:"i"`
-}
-
-// CarrierIdentity contains the SIM-issued values used by Android's carrier
-// resolver. MNC length comes from EF_AD; GID values come from EF_GID1/2.
-type CarrierIdentity struct {
-	IMSI      string
-	ICCID     string
-	SPN       string
-	GID1      string
-	GID2      string
-	MNCLength int
-}
-
-// CountryForMCC returns the ISO alpha-2 country/territory code associated with
-// a three-digit mobile country code in the embedded Android carrier database.
-func CountryForMCC(mcc string) (string, bool) {
-	mcc = strings.TrimSpace(mcc)
-	if len(mcc) != 3 {
-		return "", false
-	}
-	country := strings.ToUpper(strings.TrimSpace(globalCarrierDatabase.Countries[mcc]))
-	return country, len(country) == 2
+	Carriers map[string][]string `json:"c"`
 }
 
 var globalCarrierDatabase = func() carrierDatabase {
@@ -98,121 +64,3 @@ func CarrierForIMSI(imsi string) (plmn, name, countryCode string, ok bool) {
 	}
 	return "", "", "", false
 }
-
-// CarrierForSIM applies the constrained Android carrier-ID rules before the
-// MCC/MNC fallback. This is important for MVNO and travel eSIM profiles where
-// several customer-facing carriers authenticate through the same home PLMN.
-func CarrierForSIM(identity CarrierIdentity) (plmn, name, countryCode string, ok bool) {
-	imsi := strings.TrimSpace(identity.IMSI)
-	if !decimalDigits(imsi, 5, 20) || IsPlaceholderIMSI(imsi) {
-		return "", "", "", false
-	}
-	plmns := carrierPLMNCandidates(imsi, identity.MNCLength)
-	bestScore := -1
-	for _, rule := range globalCarrierDatabase.Rules {
-		matchedPLMN := firstMatchingValue(rule.PLMNs, func(value string) bool {
-			return containsString(plmns, value)
-		})
-		if matchedPLMN == "" {
-			continue
-		}
-		score := 1 << 8
-		if len(rule.IMSIPatterns) > 0 {
-			if firstMatchingValue(rule.IMSIPatterns, func(pattern string) bool { return imsiPatternMatch(imsi, pattern) }) == "" {
-				continue
-			}
-			score += 1 << 7
-		}
-		if len(rule.ICCIDPrefixes) > 0 {
-			if firstMatchingValue(rule.ICCIDPrefixes, func(prefix string) bool { return strings.HasPrefix(identity.ICCID, prefix) }) == "" {
-				continue
-			}
-			score += 1 << 6
-		}
-		if len(rule.GID1Prefixes) > 0 {
-			if firstMatchingValue(rule.GID1Prefixes, func(prefix string) bool { return prefixFold(identity.GID1, prefix) }) == "" {
-				continue
-			}
-			score += 1 << 5
-		}
-		if len(rule.GID2Prefixes) > 0 {
-			if firstMatchingValue(rule.GID2Prefixes, func(prefix string) bool { return prefixFold(identity.GID2, prefix) }) == "" {
-				continue
-			}
-			score += 1 << 4
-		}
-		if len(rule.SPNs) > 0 {
-			if !containsFold(rule.SPNs, identity.SPN) {
-				continue
-			}
-			score += 1 << 1
-		}
-		if score > bestScore {
-			bestScore = score
-			plmn = matchedPLMN
-			name = strings.TrimSpace(rule.Name)
-		}
-	}
-	if bestScore >= 0 && name != "" {
-		countryCode, _ = CountryForMCC(plmn[:3])
-		return plmn, name, countryCode, true
-	}
-	return CarrierForIMSI(imsi)
-}
-
-func carrierPLMNCandidates(imsi string, mncLength int) []string {
-	if (mncLength == 2 || mncLength == 3) && len(imsi) >= 3+mncLength {
-		return []string{imsi[:3+mncLength]}
-	}
-	result := make([]string, 0, 2)
-	for _, length := range []int{6, 5} {
-		if len(imsi) >= length {
-			result = append(result, imsi[:length])
-		}
-	}
-	return result
-}
-
-func firstMatchingValue(values []string, match func(string) bool) string {
-	for _, value := range values {
-		if match(value) {
-			return value
-		}
-	}
-	return ""
-}
-
-func containsString(values []string, wanted string) bool {
-	for _, value := range values {
-		if value == wanted {
-			return true
-		}
-	}
-	return false
-}
-
-func containsFold(values []string, wanted string) bool {
-	for _, value := range values {
-		if strings.EqualFold(value, wanted) {
-			return true
-		}
-	}
-	return false
-}
-
-func prefixFold(value, prefix string) bool {
-	return strings.HasPrefix(strings.ToLower(strings.TrimSpace(value)), strings.ToLower(strings.TrimSpace(prefix)))
-}
-
-func imsiPatternMatch(imsi, pattern string) bool {
-	pattern = strings.TrimSpace(pattern)
-	if len(imsi) < len(pattern) {
-		return false
-	}
-	for index, value := range pattern {
-		if value != 'x' && value != 'X' && byte(value) != imsi[index] {
-			return false
-		}
-	}
-	return true
-}

internal/device/controls.go

@@ -277,10 +277,6 @@ func (manager *Manager) SetFlight(
 	if manager.candidateFor(state).HardwareKind == "pcsc" {
 		return FlightResult{PreviousMode: 4, CurrentMode: 4, FlightMode: true, RadioOff: true}, nil
 	}
-	if result, handled, err := manager.setNativeQMIFlight(ctx, id, state, enabled); handled {
-		manager.setResult(id, state, nil, err)
-		return result, err
-	}
 	client, err := manager.clientLocked(ctx, state, manager.candidateFor(state))
 	if err != nil {
 		manager.setResult(id, state, nil, err)

internal/device/controls_test.go

@@ -2,209 +2,9 @@ package device
 
 import (
 	"context"
-	"errors"
 	"testing"
-
-	"github.com/iniwex5/quectel-qmi-go/pkg/qmi"
-
-	"vocat/internal/modem"
 )
 
-type fakeQMIRadioSession struct {
-	mode           qmi.OperatingMode
-	getModes       []qmi.OperatingMode
-	setModes       []qmi.OperatingMode
-	getErr         error
-	setErr         error
-	closeCount     int
-	iccid          string
-	iccidErr       error
-	imei           string
-	imeiErr        error
-	openedAIDs     [][]byte
-	openChannel    byte
-	openErr        error
-	closedChannels []byte
-	apdus          [][]byte
-	apduResponse   []byte
-	apduErr        error
-}
-
-func (session *fakeQMIRadioSession) GetOperatingMode(context.Context) (qmi.OperatingMode, error) {
-	if len(session.getModes) > 0 {
-		mode := session.getModes[0]
-		session.getModes = session.getModes[1:]
-		return mode, session.getErr
-	}
-	return session.mode, session.getErr
-}
-
-func (session *fakeQMIRadioSession) SetOperatingMode(_ context.Context, mode qmi.OperatingMode) error {
-	if session.setErr != nil {
-		return session.setErr
-	}
-	session.setModes = append(session.setModes, mode)
-	session.mode = mode
-	return nil
-}
-
-func (session *fakeQMIRadioSession) Close() error {
-	session.closeCount++
-	return nil
-}
-
-func (session *fakeQMIRadioSession) GetICCID(context.Context) (string, error) {
-	return session.iccid, session.iccidErr
-}
-
-func (session *fakeQMIRadioSession) GetIMEI(context.Context) (string, error) {
-	return session.imei, session.imeiErr
-}
-
-func (session *fakeQMIRadioSession) OpenLogicalChannel(_ context.Context, _ uint8, aid []byte) (byte, error) {
-	session.openedAIDs = append(session.openedAIDs, append([]byte(nil), aid...))
-	if session.openErr != nil {
-		return 0, session.openErr
-	}
-	if session.openChannel == 0 {
-		return 1, nil
-	}
-	return session.openChannel, nil
-}
-
-func (session *fakeQMIRadioSession) CloseLogicalChannel(_ context.Context, _ uint8, channel uint8) error {
-	session.closedChannels = append(session.closedChannels, channel)
-	return nil
-}
-
-func (session *fakeQMIRadioSession) SendAPDU(_ context.Context, _ uint8, _ uint8, command []byte) ([]byte, error) {
-	session.apdus = append(session.apdus, append([]byte(nil), command...))
-	return append([]byte(nil), session.apduResponse...), session.apduErr
-}
-
-func newStartedNativeQMITestManager(t *testing.T) (*Manager, *staticOpener, string) {
-	t.Helper()
-	const id = "wwan0"
-	opener := &staticOpener{client: &transcriptClient{}}
-	manager, err := NewManager(Options{
-		Discoverer: staticDiscoverer{candidates: []modem.Candidate{{
-			ID:               id,
-			Product:          "410 WiFi stick",
-			QMIControl:       "/dev/wwan0qmi0",
-			NetworkInterface: "wwan0",
-			ATPort: modem.Port{
-				Path: "/dev/wwan0at0",
-				Name: "wwan0at0",
-				Role: modem.PortRoleAT,
-			},
-		}}},
-		Opener: opener,
-	})
-	if err != nil {
-		t.Fatalf("NewManager: %v", err)
-	}
-	if err := manager.Start(context.Background()); err != nil {
-		t.Fatalf("Start: %v", err)
-	}
-	manager.mu.Lock()
-	manager.devices[id].snapshot = &Snapshot{
-		DeviceID:      id,
-		OperatingMode: 7,
-		ModeKnown:     true,
-		FlightMode:    true,
-		RadioOff:      true,
-	}
-	manager.mu.Unlock()
-	t.Cleanup(func() { _ = manager.Stop(context.Background()) })
-	return manager, opener, id
-}
-
-func TestSetFlightUsesQMIDMSForNativeWWAN(t *testing.T) {
-	manager, atOpener, id := newStartedNativeQMITestManager(t)
-	session := &fakeQMIRadioSession{mode: qmi.ModeOffline}
-	var openedPath string
-	manager.qmiRadioOpener = func(_ context.Context, path string) (qmiRadioSession, error) {
-		openedPath = path
-		return session, nil
-	}
-
-	disabled, err := manager.SetFlight(context.Background(), id, false)
-	if err != nil {
-		t.Fatalf("disable flight mode: %v", err)
-	}
-	if !disabled.Changed || disabled.PreviousMode != 7 || disabled.CurrentMode != 1 ||
-		disabled.FlightMode || disabled.RadioOff {
-		t.Fatalf("disable result = %#v", disabled)
-	}
-	enabled, err := manager.SetFlight(context.Background(), id, true)
-	if err != nil {
-		t.Fatalf("enable flight mode: %v", err)
-	}
-	if !enabled.Changed || enabled.PreviousMode != 1 || enabled.CurrentMode != 0 ||
-		!enabled.FlightMode || !enabled.RadioOff {
-		t.Fatalf("enable result = %#v", enabled)
-	}
-	if openedPath != "/dev/wwan0qmi0" {
-		t.Fatalf("QMI path = %q", openedPath)
-	}
-	if len(session.setModes) != 2 || session.setModes[0] != qmi.ModeOnline || session.setModes[1] != qmi.ModeLowPower {
-		t.Fatalf("QMI modes = %v", session.setModes)
-	}
-	if session.closeCount != 2 {
-		t.Fatalf("QMI close count = %d", session.closeCount)
-	}
-	if atOpener.openCount != 0 {
-		t.Fatalf("AT opener used %d times for native QMI flight mode", atOpener.openCount)
-	}
-	entry, err := manager.Get(id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if entry.Snapshot == nil || entry.Snapshot.OperatingMode != 0 || !entry.Snapshot.FlightMode {
-		t.Fatalf("snapshot = %#v", entry.Snapshot)
-	}
-}
-
-func TestSetFlightDoesNotFallBackToUnsupportedATWhenQMIUnavailable(t *testing.T) {
-	manager, atOpener, id := newStartedNativeQMITestManager(t)
-	wantErr := errors.New("QMI DMS unavailable")
-	manager.qmiRadioOpener = func(context.Context, string) (qmiRadioSession, error) {
-		return nil, wantErr
-	}
-
-	if _, err := manager.SetFlight(context.Background(), id, false); !errors.Is(err, wantErr) {
-		t.Fatalf("SetFlight error = %v, want %v", err, wantErr)
-	}
-	if atOpener.openCount != 0 {
-		t.Fatalf("AT opener used %d times after QMI failure", atOpener.openCount)
-	}
-}
-
-func TestSetFlightWaitsForAsynchronousQMIModeTransition(t *testing.T) {
-	manager, atOpener, id := newStartedNativeQMITestManager(t)
-	session := &fakeQMIRadioSession{
-		mode:     qmi.ModeShutdown,
-		getModes: []qmi.OperatingMode{qmi.ModeShutdown, qmi.ModeShutdown, qmi.ModeOnline},
-	}
-	manager.qmiRadioOpener = func(context.Context, string) (qmiRadioSession, error) {
-		return session, nil
-	}
-
-	result, err := manager.SetFlight(context.Background(), id, false)
-	if err != nil {
-		t.Fatalf("disable flight mode: %v", err)
-	}
-	if !result.Changed || result.PreviousMode != 7 || result.CurrentMode != 1 || result.FlightMode {
-		t.Fatalf("result = %#v", result)
-	}
-	if len(session.setModes) != 1 || session.setModes[0] != qmi.ModeOnline {
-		t.Fatalf("QMI modes = %v", session.setModes)
-	}
-	if atOpener.openCount != 0 {
-		t.Fatalf("AT opener used %d times during QMI transition", atOpener.openCount)
-	}
-}
-
 func TestSetFlightPreservesRawCFUNZero(t *testing.T) {
 	client := &transcriptClient{steps: []clientStep{
 		{command: "AT+CFUN?", response: okResponse("+CFUN: 0")},

internal/device/data.go

@@ -99,31 +99,6 @@ func (manager *Manager) SetNetwork(
 		if candidate.QMIControl == "" || candidate.NetworkInterface == "" {
 			return NetworkResult{}, fmt.Errorf("%w: QMI control device and network interface are required", ErrDataBackendUnavailable)
 		}
-		// OpenStick's native WWAN path must drive registration through QMI NAS.
-		// AT+COPS only updates the legacy AT facade on this firmware and can leave
-		// NAS in not-registered-searching, which then makes qmi-network report a
-		// generic-no-service call failure.
-		if request.Enabled && isNativeQMICandidate(candidate) {
-			registrationContext, cancel := context.WithTimeout(ctx, manager.scanTimeout)
-			registrationSession, openErr := manager.openNativeQMIRegistration(registrationContext, candidate)
-			if openErr != nil {
-				cancel()
-				manager.setResult(id, state, nil, openErr)
-				return NetworkResult{}, fmt.Errorf("prepare native QMI registration: %w", openErr)
-			}
-			registrationErr := ensureNativeQMIRegistration(
-				registrationContext,
-				registrationSession,
-				qmiRegistrationRequestAutomatic(),
-				true,
-			)
-			_ = registrationSession.Close()
-			cancel()
-			if registrationErr != nil {
-				manager.setResult(id, state, nil, registrationErr)
-				return NetworkResult{}, registrationErr
-			}
-		}
 		result, err := setQMINetwork(ctx, candidate, request.Enabled, apn, ipVersion, request.Username, request.Password, authentication)
 		if err != nil && (request.Username != "" || request.Password != "") {
 			// qmi-network output is outside our control and may echo values read
@@ -297,19 +272,6 @@ func usbNetModeName(mode int) string {
 }
 
 func (manager *Manager) OperatorSelection(ctx context.Context, id string) (OperatorSelection, error) {
-	state, err := manager.lookup(id)
-	if err != nil {
-		return OperatorSelection{}, err
-	}
-	candidate := manager.candidateFor(state)
-	if isNativeQMICandidate(candidate) {
-		state.opMu.Lock()
-		defer state.opMu.Unlock()
-		if err := manager.validateActive(id, state); err != nil {
-			return OperatorSelection{}, err
-		}
-		return manager.nativeQMIOperatorSelectionLocked(ctx, candidate)
-	}
 	response, err := manager.ExecuteAT(ctx, id, "AT+COPS?")
 	if err != nil {
 		return OperatorSelection{}, err
@@ -373,18 +335,6 @@ func (manager *Manager) SetOperatorSelection(
 	if err := manager.validateActive(id, state); err != nil {
 		return OperatorSelection{}, err
 	}
-	candidate := manager.candidateFor(state)
-	if isNativeQMICandidate(candidate) {
-		selection, err := manager.setNativeQMIOperatorSelectionLocked(
-			ctx,
-			candidate,
-			automatic,
-			plmn,
-			accessTechnologyValue,
-		)
-		manager.setResult(id, state, nil, err)
-		return selection, err
-	}
 	client, err := manager.clientLocked(ctx, state, manager.candidateFor(state))
 	if err != nil {
 		manager.setResult(id, state, nil, err)
@@ -485,12 +435,6 @@ func (manager *Manager) ReRegisterOperator(ctx context.Context, id string) (Oper
 	if err := manager.validateActive(id, state); err != nil {
 		return OperatorSelection{}, err
 	}
-	candidate := manager.candidateFor(state)
-	if isNativeQMICandidate(candidate) {
-		selection, err := manager.reRegisterNativeQMIOperatorLocked(ctx, candidate)
-		manager.setResult(id, state, nil, err)
-		return selection, err
-	}
 	client, err := manager.clientLocked(ctx, state, manager.candidateFor(state))
 	if err != nil {
 		manager.setResult(id, state, nil, err)

internal/device/esim.go

@@ -8,8 +8,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/iniwex5/quectel-qmi-go/pkg/qmi"
-
 	"vocat/internal/i18n"
 	"vocat/internal/modem"
 	"vocat/internal/pcsc"
@@ -161,20 +159,12 @@ func encodeICCID(digits string) ([]byte, error) {
 }
 
 func buildEnableProfileRequest(iccid string) ([]byte, error) {
-	return buildEnableProfileRequestWithRefresh(iccid, true)
-}
-
-func buildEnableProfileRequestWithRefresh(iccid string, refresh bool) ([]byte, error) {
 	bcd, err := encodeICCID(iccid)
 	if err != nil {
 		return nil, err
 	}
 	profileID := derConstruct(0xA0, derEncode(0x5A, bcd))
-	refreshFlag := byte(0x00)
-	if refresh {
-		refreshFlag = 0xFF
-	}
-	return derConstruct(0xBF31, profileID, derEncode(0x81, []byte{refreshFlag})), nil
+	return derConstruct(0xBF31, profileID, derEncode(0x81, []byte{0xFF})), nil
 }
 
 // parseCSIM extracts the payload and status word from an AT+CSIM response.
@@ -205,74 +195,9 @@ type euiccChannel struct {
 	id           string
 	channel      int
 	pcscSession  *pcsc.Session
-	qmiSession   nativeQMIEuiccSession
-	qmiSlot      uint8
 	resetOnClose bool
 }
 
-func (channel *euiccChannel) registerProfileRefresh(ctx context.Context) (bool, error) {
-	refreshSession, ok := channel.qmiSession.(nativeQMIRefreshSession)
-	if !ok {
-		return false, nil
-	}
-	if err := refreshSession.RegisterUIMRefresh(ctx); err != nil {
-		var unsupported *qmi.NotSupportedError
-		if errors.As(err, &unsupported) {
-			return false, nil
-		}
-		return false, err
-	}
-	return true, nil
-}
-
-func (channel *euiccChannel) completeProfileRefresh(ctx context.Context) error {
-	refreshSession, ok := channel.qmiSession.(nativeQMIRefreshSession)
-	if !ok {
-		return nil
-	}
-	return refreshSession.CompleteUIMRefresh(ctx)
-}
-
-func (channel *euiccChannel) acknowledgeProfileRefresh(ctx context.Context) error {
-	refreshSession, ok := channel.qmiSession.(nativeQMIRefreshSession)
-	if !ok {
-		return nil
-	}
-	return refreshSession.AcknowledgeUIMRefresh(ctx)
-}
-
-func (channel *euiccChannel) recoverCATBusy(ctx context.Context) error {
-	if channel.qmiSession == nil {
-		return nil
-	}
-	// A power cycle must happen while the CAT2 client remains registered, or
-	// the card can issue its first proactive command before VoCat is listening
-	// and immediately become busy again.
-	if channel.channel > 0 {
-		_ = channel.qmiSession.CloseLogicalChannel(ctx, channel.qmiSlot, byte(channel.channel))
-		channel.channel = 0
-	}
-	power, ok := channel.qmiSession.(interface {
-		PowerOffSIM(context.Context, uint8) error
-		PowerOnSIM(context.Context, uint8) error
-	})
-	if !ok {
-		return nil
-	}
-	if err := power.PowerOffSIM(ctx, channel.qmiSlot); err != nil {
-		return err
-	}
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	case <-time.After(time.Second):
-	}
-	if err := power.PowerOnSIM(ctx, channel.qmiSlot); err != nil {
-		return err
-	}
-	return channel.completeProfileRefresh(ctx)
-}
-
 // csimAPDUTimeout bounds a single AT+CSIM exchange. Loading a BoundProfilePackage
 // makes the eUICC decrypt/write sizeable SCP03t segments on-card, which can exceed
 // the modem's default 3s command timeout, so eSIM APDUs get a longer budget.
@@ -364,9 +289,6 @@ func (manager *Manager) openEuiccOnceAID(ctx context.Context, id, aidHex string)
 	if candidate.HardwareKind == pcsc.HardwareKind {
 		return manager.openPCSCEuiccOnceAID(ctx, id, candidate, aidHex)
 	}
-	if strings.EqualFold(manager.backendFor(state), "qmi") && isNativeQMICandidate(candidate) {
-		return manager.openQMIEuiccOnceAID(ctx, id, candidate, aidHex)
-	}
 	// MANAGE CHANNEL (open): 00 70 00 00 01 -> "<channel> 90 00". This EC20
 	// firmware requires the explicit one-byte expected length: Le=00 opens a
 	// channel but then rejects SELECT ISD-R at the AT+CSIM layer.
@@ -405,38 +327,6 @@ func (manager *Manager) openEuiccOnceAID(ctx context.Context, id, aidHex string)
 	return channel, nil
 }
 
-func (manager *Manager) openQMIEuiccOnceAID(ctx context.Context, id string, candidate modem.Candidate, aidHex string) (*euiccChannel, error) {
-	aidHex = strings.ToUpper(strings.TrimSpace(aidHex))
-	aid, err := hex.DecodeString(aidHex)
-	if err != nil || len(aid) == 0 || len(aid) > 255 {
-		return nil, fmt.Errorf("esim: invalid ISD-R AID %q", aidHex)
-	}
-	if manager.qmiRadioOpener == nil {
-		return nil, errors.New("esim: QMI UIM transport is unavailable")
-	}
-	openContext, cancel := context.WithTimeout(ctx, csimAPDUTimeout)
-	defer cancel()
-	radioSession, err := manager.qmiRadioOpener(openContext, candidate.QMIControl)
-	if err != nil {
-		return nil, fmt.Errorf("esim: open QMI UIM transport: %w", err)
-	}
-	session, ok := radioSession.(nativeQMIEuiccSession)
-	if !ok {
-		_ = radioSession.Close()
-		return nil, errors.New("esim: QMI UIM transport does not support logical channels")
-	}
-	const slot uint8 = 1
-	logicalChannel, err := session.OpenLogicalChannel(openContext, slot, aid)
-	if err != nil {
-		_ = session.Close()
-		return nil, fmt.Errorf("%w: %v", errNoEUICC, err)
-	}
-	return &euiccChannel{
-		manager: manager, id: id, channel: int(logicalChannel),
-		qmiSession: session, qmiSlot: slot,
-	}, nil
-}
-
 func (manager *Manager) openPCSCEuiccOnceAID(ctx context.Context, id string, candidate modem.Candidate, aidHex string) (*euiccChannel, error) {
 	session, err := manager.cardReaders.OpenSession(ctx, pcsc.Selector{
 		USBPath: candidate.USBPath, ReaderName: candidate.ReaderName,
@@ -517,14 +407,6 @@ func isTransientEuiccCME(err error) bool {
 
 // close releases the logical channel (MANAGE CHANNEL close).
 func (channel *euiccChannel) close(ctx context.Context) {
-	if channel.qmiSession != nil {
-		if channel.channel > 0 {
-			_ = channel.qmiSession.CloseLogicalChannel(ctx, channel.qmiSlot, byte(channel.channel))
-		}
-		_ = channel.qmiSession.Close()
-		channel.qmiSession = nil
-		return
-	}
 	closeAPDU := []byte{0x00, 0x70, 0x80, byte(channel.channel), 0x00}
 	_, _, _ = channel.exchange(ctx, closeAPDU)
 	if channel.pcscSession != nil {
@@ -538,17 +420,6 @@ func (channel *euiccChannel) close(ctx context.Context) {
 }
 
 func (channel *euiccChannel) exchange(ctx context.Context, apdu []byte) ([]byte, int, error) {
-	if channel.qmiSession != nil {
-		raw, err := channel.qmiSession.SendAPDU(ctx, channel.qmiSlot, byte(channel.channel), apdu)
-		if err != nil {
-			return nil, 0, err
-		}
-		if len(raw) < 2 {
-			return nil, 0, fmt.Errorf("esim: short QMI UIM APDU response")
-		}
-		sw := int(raw[len(raw)-2])<<8 | int(raw[len(raw)-1])
-		return raw[:len(raw)-2], sw, nil
-	}
 	if channel.pcscSession != nil {
 		payload, sw, err := channel.pcscSession.Transmit(ctx, apdu)
 		return payload, int(sw), err
@@ -781,9 +652,9 @@ func (manager *Manager) ESIMSwitchProfile(ctx context.Context, id string, iccid
 	if iccid == "" {
 		return errors.New("esim: an ICCID is required")
 	}
-	_, nativeQMI, nativeErr := manager.nativeQMIControl(id)
-	if nativeErr != nil {
-		return nativeErr
+	der, err := buildEnableProfileRequest(iccid)
+	if err != nil {
+		return err
 	}
 	manager.lockESIM()
 	if err := manager.waitForESIMRecovery(ctx, id); err != nil {
@@ -795,31 +666,6 @@ func (manager *Manager) ESIMSwitchProfile(ctx context.Context, id string, iccid
 		manager.unlockESIM()
 		return err
 	}
-	refreshRequested := !nativeQMI
-	if nativeQMI {
-		refreshContext, cancelRefresh := context.WithTimeout(context.WithoutCancel(ctx), 10*time.Second)
-		refreshRequested, err = channel.registerProfileRefresh(refreshContext)
-		cancelRefresh()
-		if err != nil {
-			channel.close(context.Background())
-			manager.unlockESIM()
-			return fmt.Errorf("esim: register QMI UIM refresh: %w", err)
-		}
-		// After a refresh=true attempt reports catBusy, retry without asking the
-		// eUICC to start another REFRESH proactive command. SGP.22 permits the
-		// card to terminate the pre-existing proactive session in this mode; the
-		// native-QMI recovery below performs the required SIM reset and cache
-		// reload on behalf of the device.
-		if attempt, _ := ctx.Value(esimCATBusyRetryKey{}).(int); attempt > 0 {
-			refreshRequested = false
-		}
-	}
-	der, err := buildEnableProfileRequestWithRefresh(iccid, refreshRequested)
-	if err != nil {
-		channel.close(context.Background())
-		manager.unlockESIM()
-		return err
-	}
 
 	// EnableProfile request (SGP.22 ES10c, per lpac):
 	//   BF31 { A0 { 5A <iccid bcd> } 81 01 FF }   (refresh = yes)
@@ -829,38 +675,10 @@ func (manager *Manager) ESIMSwitchProfile(ctx context.Context, id string, iccid
 	// stays a sibling of A0, directly under BF31.
 	// EnableProfile is a non-idempotent commit. Once its APDU starts, a browser
 	// disconnect or reverse-proxy timeout must not cancel it halfway through and
-	// skip post-commit recovery; EC20 may otherwise remain in SIM failure
-	// (+CME 13).
+	// skip the modem reset, otherwise EC20 remains in SIM failure (+CME 13).
 	commitContext, cancelCommit := context.WithTimeout(context.WithoutCancel(ctx), csimAPDUTimeout)
 	payload, err := channel.es10(commitContext, der)
 	cancelCommit()
-	// A rejected EnableProfile (for example CAT busy) does not emit REFRESH.
-	// Parse the card-level result before waiting for an indication, otherwise
-	// every retry needlessly waits for the refresh timeout.
-	resultBeforeClose, resultPresentBeforeClose := enableProfileResult(payload)
-	if err == nil && resultPresentBeforeClose && byte(resultBeforeClose) == 5 && nativeQMI {
-		// Registering CAT2 may immediately deliver a proactive command that was
-		// already pending before EnableProfile. Drain it on catBusy so the raw
-		// REFRESH command receives its terminal response before the retry.
-		catContext, cancelCAT := context.WithTimeout(context.Background(), 3*time.Second)
-		_ = channel.completeProfileRefresh(catContext)
-		cancelCAT()
-		if attempt, _ := ctx.Value(esimCATBusyRetryKey{}).(int); attempt == 0 {
-			recoveryContext, cancelRecovery := context.WithTimeout(context.Background(), 12*time.Second)
-			_ = channel.recoverCATBusy(recoveryContext)
-			cancelRecovery()
-		}
-		ackContext, cancelAck := context.WithTimeout(context.Background(), 5*time.Second)
-		_ = channel.acknowledgeProfileRefresh(ackContext)
-		cancelAck()
-	}
-	if err == nil && resultPresentBeforeClose &&
-		enableProfileResponseError(byte(resultBeforeClose), payload) == nil &&
-		refreshRequested && nativeQMI {
-		refreshContext, cancelRefresh := context.WithTimeout(context.Background(), 20*time.Second)
-		_ = channel.completeProfileRefresh(refreshContext)
-		cancelRefresh()
-	}
 	// Release the logical channel before any reset: openEuicc's csim holds
 	// opMu only for the duration of each APDU, so by here the lock is free.
 	closeContext, cancelClose := context.WithTimeout(context.Background(), csimAPDUTimeout)
@@ -885,48 +703,10 @@ func (manager *Manager) ESIMSwitchProfile(ctx context.Context, id string, iccid
 		return fmt.Errorf("esim: unexpected EnableProfile response %s", strings.ToUpper(hex.EncodeToString(payload)))
 	}
 	if err := enableProfileResponseError(byte(result), payload); err != nil {
-		if errors.Is(err, ErrESIMEnableCATBusy) {
-			attempt, _ := ctx.Value(esimCATBusyRetryKey{}).(int)
-			if attempt < 11 {
-				manager.unlockESIM()
-				select {
-				case <-ctx.Done():
-					return ctx.Err()
-				case <-time.After(2 * time.Second):
-				}
-				return manager.ESIMSwitchProfile(context.WithValue(ctx, esimCATBusyRetryKey{}, attempt+1), id, iccid, aidHex)
-			}
-		}
 		manager.unlockESIM()
 		return err
 	}
 	manager.markCachedProfileEnabled(id, iccid)
-	// EnableProfile already requested an eUICC REFRESH. Some AT modems consume
-	// that proactive command and expose the new subscription immediately, so a
-	// full CFUN=1,1 reset would only add downtime. Give those devices a short
-	// chance to prove that their SIM cache is current; modems that keep reporting
-	// the old ICCID continue through the established reboot/recovery path below.
-	if manager.canVerifyProfileSwitchWithoutRestart(id) {
-		probeContext, cancelProbe := context.WithTimeout(
-			context.WithoutCancel(ctx),
-			profileSwitchRefreshProbeTimeout(manager),
-		)
-		probeErr := manager.verifySwitchedICCIDAttempts(probeContext, id, iccid, 3, time.Second)
-		cancelProbe()
-		if probeErr == nil {
-			// Repopulate the cached snapshot while the AT transport is still live.
-			// Verification above is authoritative, so snapshot refresh remains
-			// best-effort just as it is after the legacy reboot path.
-			refreshContext, cancelRefresh := context.WithTimeout(
-				context.WithoutCancel(ctx),
-				manager.longTimeout,
-			)
-			_, _ = manager.Refresh(refreshContext, id)
-			cancelRefresh()
-			manager.unlockESIM()
-			return nil
-		}
-	}
 	// The eUICC accepted the target profile. Reset and repopulate the modem in
 	// a detached recovery so it survives an HTTP disconnect, but keep this API
 	// call pending until the live modem ICCID proves that the switch took effect.
@@ -941,8 +721,6 @@ func (manager *Manager) ESIMSwitchProfile(ctx context.Context, id string, iccid
 	return manager.verifySwitchedICCID(verifyContext, id, iccid)
 }
 
-type esimCATBusyRetryKey struct{}
-
 func (manager *Manager) startProfileSwitchRecovery(id string) {
 	done := make(chan struct{})
 	manager.esimRecoveryMu.Lock()
@@ -1075,18 +853,6 @@ func (manager *Manager) renameCachedProfile(id, iccid, nickname string) {
 // initiating HTTP request. EC20 commonly drops the AT port while processing
 // CFUN=1,1, so the reset error is intentionally followed by discovery retries.
 func (manager *Manager) recoverAfterProfileSwitch(id string) {
-	resetContext, cancelReset := context.WithTimeout(context.Background(), manager.longTimeout)
-	if native, err := manager.powerCycleNativeQMISIM(resetContext, id); native {
-		cancelReset()
-		if err == nil {
-			time.Sleep(1500 * time.Millisecond)
-		}
-		// Native WWAN identity and profile verification are both QMI-backed.
-		// Do not enter the AT refresh path: OpenStick firmware can accept the
-		// switch while timing out every EC20-specific AT identity command.
-		return
-	}
-	cancelReset()
 	if !manager.isPCSCDevice(id) {
 		resetContext, cancelReset := context.WithTimeout(context.Background(), manager.longTimeout)
 		_ = manager.rebootForProfileSwitch(resetContext, id)
@@ -1209,69 +975,17 @@ func profileSwitchVerificationTimeout(manager *Manager) time.Duration {
 	return timeout
 }
 
-func profileSwitchRefreshProbeTimeout(manager *Manager) time.Duration {
-	// Allow both standard ICCID commands to consume one ordinary command
-	// timeout, plus a small window for the eUICC REFRESH to settle. Keep the
-	// optimisation bounded so an older modem reaches its required reboot soon.
-	timeout := manager.commandTimeout*2 + time.Second
-	if timeout < 3*time.Second {
-		return 3 * time.Second
-	}
-	if timeout > 10*time.Second {
-		return 10 * time.Second
-	}
-	return timeout
-}
-
-func (manager *Manager) canVerifyProfileSwitchWithoutRestart(id string) bool {
-	_, native, err := manager.nativeQMIControl(id)
-	return err == nil && !native && !manager.isPCSCDevice(id)
-}
-
 // verifySwitchedICCID performs a fresh baseband read after recovery. An ES10c
 // result of zero only means the eUICC accepted the operation; the state change
 // is finalized by REFRESH/reset. The UI must not report success until the modem
 // is actually exposing the requested ICCID.
 func (manager *Manager) verifySwitchedICCID(ctx context.Context, id, expected string) error {
-	return manager.verifySwitchedICCIDAttempts(ctx, id, expected, 6, 2*time.Second)
-}
-
-func (manager *Manager) verifySwitchedICCIDAttempts(
-	ctx context.Context,
-	id string,
-	expected string,
-	attempts int,
-	interval time.Duration,
-) error {
 	expected = strings.TrimSpace(expected)
+	const attempts = 6
 	var lastICCID string
 	var lastErr error
 	for attempt := 0; attempt < attempts; attempt++ {
-		if control, native, nativeErr := manager.nativeQMIControl(id); native {
-			if nativeErr != nil {
-				lastErr = nativeErr
-			} else {
-				state, lookupErr := manager.lookup(id)
-				if lookupErr != nil {
-					lastErr = lookupErr
-				} else {
-					candidate := manager.candidateFor(state)
-					candidate.QMIControl = control
-					live, readErr := manager.readNativeQMIICCID(ctx, candidate)
-					if readErr == nil {
-						lastICCID = strings.TrimSpace(live)
-						if lastICCID == expected {
-							return nil
-						}
-						lastErr = fmt.Errorf("native QMI still reports ICCID %s", lastICCID)
-					} else {
-						lastErr = readErr
-					}
-				}
-			}
-		} else if nativeErr != nil {
-			lastErr = nativeErr
-		} else if manager.isPCSCDevice(id) {
+		if manager.isPCSCDevice(id) {
 			snapshot, err := manager.Refresh(ctx, id)
 			if err == nil {
 				lastICCID = strings.TrimSpace(snapshot.ICCID)
@@ -1305,7 +1019,7 @@ func (manager *Manager) verifySwitchedICCIDAttempts(
 		}
 		if attempt+1 < attempts {
 			select {
-			case <-time.After(interval):
+			case <-time.After(2 * time.Second):
 			case <-ctx.Done():
 				return fmt.Errorf("esim: verify enabled profile %s: %w", expected, ctx.Err())
 			}

internal/device/esim_test.go

@@ -1,7 +1,6 @@
 package device
 
 import (
-	"bytes"
 	"context"
 	"encoding/hex"
 	"errors"
@@ -207,38 +206,6 @@ func TestVerifySwitchedICCIDReadsLiveModem(t *testing.T) {
 	client.assertDone(t)
 }
 
-func TestVerifySwitchedICCIDAttemptsAllowsProactiveRefreshToSettle(t *testing.T) {
-	const target = "89492026266006792824"
-	client := &transcriptClient{steps: []clientStep{
-		{command: "AT+CCID", response: okResponse("+CCID: 89441000400128014257F")},
-		{command: "AT+CCID", response: okResponse("+CCID: " + target + "F")},
-	}}
-	manager, id := newStartedTestManager(t, client)
-	if !manager.canVerifyProfileSwitchWithoutRestart(id) {
-		t.Fatal("AT modem should be eligible for refresh verification before restart")
-	}
-	if err := manager.verifySwitchedICCIDAttempts(context.Background(), id, target, 2, 0); err != nil {
-		t.Fatalf("verifySwitchedICCIDAttempts: %v", err)
-	}
-	client.assertDone(t)
-}
-
-func TestProfileSwitchRefreshProbeTimeoutIsBounded(t *testing.T) {
-	for _, test := range []struct {
-		command time.Duration
-		want    time.Duration
-	}{
-		{command: 100 * time.Millisecond, want: 3 * time.Second},
-		{command: 3 * time.Second, want: 7 * time.Second},
-		{command: 30 * time.Second, want: 10 * time.Second},
-	} {
-		manager := &Manager{commandTimeout: test.command}
-		if got := profileSwitchRefreshProbeTimeout(manager); got != test.want {
-			t.Fatalf("command timeout %s: probe timeout = %s, want %s", test.command, got, test.want)
-		}
-	}
-}
-
 func TestEUMManufacturerForWatchData(t *testing.T) {
 	if got := eumManufacturerForEID("35840574202500000125000001855764"); got != "WatchData Technologies Ltd." {
 		t.Fatalf("manufacturer = %q", got)
@@ -316,41 +283,6 @@ func TestDiscoverEuiccAIDsFindsXeSIMAlternateISDR(t *testing.T) {
 	client.assertDone(t)
 }
 
-func TestNativeQMIUsesUIMLogicalChannelForEUICC(t *testing.T) {
-	manager, _, id := newStartedNativeQMITestManager(t)
-	if err := manager.SetBackend(id, "qmi"); err != nil {
-		t.Fatal(err)
-	}
-	session := &fakeQMIRadioSession{
-		openChannel:  3,
-		apduResponse: []byte{0xDE, 0xAD, 0x90, 0x00},
-	}
-	manager.qmiRadioOpener = func(context.Context, string) (qmiRadioSession, error) {
-		return session, nil
-	}
-	channel, err := manager.openEuiccAID(context.Background(), id, isdRAID)
-	if err != nil {
-		t.Fatalf("open QMI eUICC: %v", err)
-	}
-	payload, sw, err := channel.transmit(context.Background(), []byte{0x80, 0xCA, 0x00, 0x00, 0x00}, 0x80)
-	if err != nil {
-		t.Fatalf("transmit QMI APDU: %v", err)
-	}
-	if !bytes.Equal(payload, []byte{0xDE, 0xAD}) || sw != 0x9000 {
-		t.Fatalf("QMI APDU response = %X/%04X", payload, sw)
-	}
-	channel.close(context.Background())
-	if len(session.openedAIDs) != 1 || strings.ToUpper(hex.EncodeToString(session.openedAIDs[0])) != isdRAID {
-		t.Fatalf("opened AIDs = %X", session.openedAIDs)
-	}
-	if len(session.apdus) != 1 || session.apdus[0][0] != 0x83 {
-		t.Fatalf("QMI APDUs = %X", session.apdus)
-	}
-	if len(session.closedChannels) != 1 || session.closedChannels[0] != 3 || session.closeCount != 1 {
-		t.Fatalf("closed channels/session = %v/%d", session.closedChannels, session.closeCount)
-	}
-}
-
 func TestEUICCChannelStuckWrapsTransientCME(t *testing.T) {
 	cause := &modem.CommandError{
 		Command: `AT+CSIM=10,"0070000001"`,

internal/device/flight_qmi.go

@@ -1,813 +0,0 @@
-package device
-
-import (
-	"context"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"log/slog"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/iniwex5/quectel-qmi-go/pkg/qmi"
-
-	"vocat/internal/qmiport"
-)
-
-type qmiRadioSession interface {
-	GetOperatingMode(context.Context) (qmi.OperatingMode, error)
-	SetOperatingMode(context.Context, qmi.OperatingMode) error
-	Close() error
-}
-
-type qmiRadioSessionOpener func(context.Context, string) (qmiRadioSession, error)
-
-type nativeQMIICCIDSession interface {
-	GetICCID(context.Context) (string, error)
-}
-
-type nativeQMIIMEISession interface {
-	GetIMEI(context.Context) (string, error)
-}
-
-type nativeQMIEuiccSession interface {
-	qmiRadioSession
-	OpenLogicalChannel(context.Context, uint8, []byte) (byte, error)
-	CloseLogicalChannel(context.Context, uint8, uint8) error
-	SendAPDU(context.Context, uint8, uint8, []byte) ([]byte, error)
-}
-
-// nativeQMIRefreshSession is implemented by production QMI sessions that can
-// participate in the modem's UIM REFRESH state machine.  Keep it separate from
-// nativeQMIEuiccSession so transcript fakes and older QMI implementations can
-// continue to use the APDU transport without pretending to handle indications.
-type nativeQMIRefreshSession interface {
-	RegisterUIMRefresh(context.Context) error
-	CompleteUIMRefresh(context.Context) error
-	AcknowledgeUIMRefresh(context.Context) error
-}
-
-type nativeQMIUIMResetSession interface {
-	ResetUIM(context.Context) error
-}
-
-type nativeQMIVoWiFiSession interface {
-	qmiRadioSession
-	GetICCID(context.Context) (string, error)
-	GetIMEI(context.Context) (string, error)
-	GetIMSI(context.Context) (string, error)
-	GetNativeMCCMNC(context.Context) (string, string, error)
-	GetUSIMAID(context.Context) ([]byte, error)
-	GetISIMAID(context.Context) ([]byte, error)
-	GetServingSystem(context.Context) (*qmi.ServingSystem, error)
-	AttachDetach(context.Context, bool) error
-	OpenLogicalChannel(context.Context, uint8, []byte) (byte, error)
-	CloseLogicalChannel(context.Context, uint8, uint8) error
-	SendAPDU(context.Context, uint8, uint8, []byte) ([]byte, error)
-	PowerOffSIM(context.Context, uint8) error
-	PowerOnSIM(context.Context, uint8) error
-}
-
-// nativeQMIControl identifies the QMI control node exposed by native WWAN
-// devices. USB serial modems may also advertise a control path, but only the
-// wwanN/qmiN pairing is safe to operate through the native QMI path.
-func (manager *Manager) nativeQMIControl(id string) (string, bool, error) {
-	state, err := manager.lookup(id)
-	if err != nil {
-		return "", false, err
-	}
-	candidate := manager.candidateFor(state)
-	controlDevice := strings.TrimSpace(candidate.QMIControl)
-	deviceID := strings.TrimSpace(candidate.ID)
-	if !nativeQMIControlMatches(deviceID, controlDevice) {
-		return "", false, nil
-	}
-	return controlDevice, true, nil
-}
-
-type productionQMIRadioSession struct {
-	client *qmi.Client
-	dms    *qmi.DMSService
-	nas    *qmi.NASService
-	nasErr error
-	catID  uint8
-	uimMu  sync.Mutex
-	uim    *qmi.UIMService
-	lease  *qmiport.Lease
-}
-
-// The native WWAN path uses the same QMI NAS client for radio wake-up,
-// operator selection, and registration.  Keep these methods optional on the
-// qmiRadioSession interface so the older transcript-backed tests and AT-only
-// devices do not need to grow a fake NAS implementation.
-func (session *productionQMIRadioSession) nasService() (*qmi.NASService, error) {
-	if session == nil {
-		return nil, errors.New("QMI NAS session is unavailable")
-	}
-	if session.nas == nil {
-		if session.nasErr != nil {
-			return nil, session.nasErr
-		}
-		return nil, errors.New("QMI NAS session is unavailable")
-	}
-	return session.nas, nil
-}
-
-func (session *productionQMIRadioSession) GetServingSystem(ctx context.Context) (*qmi.ServingSystem, error) {
-	nas, err := session.nasService()
-	if err != nil {
-		return nil, err
-	}
-	return nas.GetServingSystem(ctx)
-}
-
-func (session *productionQMIRadioSession) GetSystemSelectionPreference(ctx context.Context) (*qmi.SystemSelectionPreference, error) {
-	nas, err := session.nasService()
-	if err != nil {
-		return nil, err
-	}
-	return nas.GetSystemSelectionPreference(ctx)
-}
-
-func (session *productionQMIRadioSession) SetSystemSelectionPreference(ctx context.Context, pref qmi.SystemSelectionPreference) error {
-	nas, err := session.nasService()
-	if err != nil {
-		return err
-	}
-	return nas.SetSystemSelectionPreference(ctx, pref)
-}
-
-func (session *productionQMIRadioSession) InitiateNetworkRegister(ctx context.Context, req qmi.NASInitiateNetworkRegisterRequest) error {
-	nas, err := session.nasService()
-	if err != nil {
-		return err
-	}
-	return nas.InitiateNetworkRegister(ctx, req)
-}
-
-func (session *productionQMIRadioSession) ForceNetworkSearch(ctx context.Context) error {
-	nas, err := session.nasService()
-	if err != nil {
-		return err
-	}
-	return nas.ForceNetworkSearch(ctx)
-}
-
-func (session *productionQMIRadioSession) AttachDetach(ctx context.Context, attached bool) error {
-	nas, err := session.nasService()
-	if err != nil {
-		return err
-	}
-	return nas.AttachDetach(ctx, attached)
-}
-
-// openQMIRadioSession controls native WWAN radios through QMI DMS. OpenStick
-// 410 firmware rejects AT+CFUN=1 even though the equivalent DMS online request
-// is supported, so native WWAN devices must not fall back to the AT path.
-func openQMIRadioSession(ctx context.Context, controlDevice string) (qmiRadioSession, error) {
-	if ctx == nil {
-		ctx = context.Background()
-	}
-	openContext, cancel := context.WithTimeout(ctx, 15*time.Second)
-	defer cancel()
-	lease, err := qmiport.Acquire(openContext, controlDevice)
-	if err != nil {
-		return nil, err
-	}
-	opts := qmi.DefaultClientOptions()
-	opts.UseProxy = true
-	opts.Logf = func(qmi.ClientLogLevel, string, ...any) {}
-	client, err := qmi.NewClientWithOptions(openContext, controlDevice, opts)
-	if err != nil {
-		lease.Release()
-		return nil, err
-	}
-	dms, err := qmi.NewDMSServiceWithContext(openContext, client)
-	if err != nil {
-		_ = client.Close()
-		lease.Release()
-		return nil, err
-	}
-	// NAS is optional for ordinary radio controls. Some firmware exposes DMS
-	// but rejects NAS client allocation; keep radio control usable and report
-	// that limitation only to native registration/RF queries.
-	nas, nasErr := qmi.NewNASServiceWithContext(openContext, client)
-	return &productionQMIRadioSession{
-		client: client,
-		dms:    dms,
-		nas:    nas,
-		nasErr: nasErr,
-		lease:  lease,
-	}, nil
-}
-
-func (session *productionQMIRadioSession) GetICCID(ctx context.Context) (string, error) {
-	uim, err := session.uimService(ctx)
-	if err != nil {
-		return "", err
-	}
-	return uim.GetICCID(ctx)
-}
-
-func (session *productionQMIRadioSession) GetIMSI(ctx context.Context) (string, error) {
-	uim, err := session.uimService(ctx)
-	if err != nil {
-		return "", err
-	}
-	return uim.GetIMSI(ctx)
-}
-
-func (session *productionQMIRadioSession) GetNativeMCCMNC(ctx context.Context) (string, string, error) {
-	uim, err := session.uimService(ctx)
-	if err != nil {
-		return "", "", err
-	}
-	return uim.GetNativeMCCMNC(ctx)
-}
-
-func (session *productionQMIRadioSession) GetUSIMAID(ctx context.Context) ([]byte, error) {
-	uim, err := session.uimService(ctx)
-	if err != nil {
-		return nil, err
-	}
-	return uim.GetUSIMAID(ctx)
-}
-
-func (session *productionQMIRadioSession) GetISIMAID(ctx context.Context) ([]byte, error) {
-	uim, err := session.uimService(ctx)
-	if err != nil {
-		return nil, err
-	}
-	return uim.GetISIMAID(ctx)
-}
-
-func (session *productionQMIRadioSession) PowerOffSIM(ctx context.Context, slot uint8) error {
-	uim, err := session.uimService(ctx)
-	if err != nil {
-		return err
-	}
-	return uim.PowerOffSIM(ctx, slot)
-}
-
-func (session *productionQMIRadioSession) PowerOnSIM(ctx context.Context, slot uint8) error {
-	uim, err := session.uimService(ctx)
-	if err != nil {
-		return err
-	}
-	return uim.PowerOnSIM(ctx, slot)
-}
-
-func (session *productionQMIRadioSession) ResetUIM(ctx context.Context) error {
-	uim, err := session.uimService(ctx)
-	if err != nil {
-		return err
-	}
-	return uim.Reset(ctx)
-}
-
-func (session *productionQMIRadioSession) uimService(ctx context.Context) (*qmi.UIMService, error) {
-	if session == nil || session.client == nil {
-		return nil, errors.New("QMI UIM session is unavailable")
-	}
-	session.uimMu.Lock()
-	defer session.uimMu.Unlock()
-	if session.uim == nil {
-		uim, err := qmi.NewUIMServiceWithContext(ctx, session.client)
-		if err != nil {
-			return nil, err
-		}
-		session.uim = uim
-	}
-	return session.uim, nil
-}
-
-func (session *productionQMIRadioSession) OpenLogicalChannel(ctx context.Context, slot uint8, aid []byte) (byte, error) {
-	uim, err := session.uimService(ctx)
-	if err != nil {
-		return 0, err
-	}
-	return uim.OpenLogicalChannel(ctx, slot, aid)
-}
-
-func (session *productionQMIRadioSession) CloseLogicalChannel(ctx context.Context, slot, channel uint8) error {
-	uim, err := session.uimService(ctx)
-	if err != nil {
-		return err
-	}
-	return uim.CloseLogicalChannel(ctx, slot, channel)
-}
-
-func (session *productionQMIRadioSession) SendAPDU(ctx context.Context, slot, channel uint8, command []byte) ([]byte, error) {
-	uim, err := session.uimService(ctx)
-	if err != nil {
-		return nil, err
-	}
-	return uim.SendAPDU(ctx, slot, channel, command)
-}
-
-// RegisterUIMRefresh mirrors the terminal registration used by libqmi for a
-// physical card slot.  EnableProfile(refresh=true) may cause the eUICC to issue
-// a proactive REFRESH; without a registered terminal the card remains CAT busy
-// after the profile has changed and rejects the next profile operation.
-func (session *productionQMIRadioSession) RegisterUIMRefresh(ctx context.Context) error {
-	uim, err := session.uimService(ctx)
-	if err != nil {
-		return err
-	}
-	if err := uim.RefreshRegisterAll(ctx, qmi.UIMRefreshRegisterAllRequest{
-		SessionType:  qmi.UIMSessionTypeCardSlot1,
-		RegisterFlag: true,
-	}); err != nil {
-		return err
-	}
-	if session.catID == 0 {
-		clientID, err := session.client.AllocateClientIDWithContext(ctx, qmi.ServiceCAT2)
-		if err != nil {
-			return fmt.Errorf("allocate QMI CAT2 client: %w", err)
-		}
-		session.catID = clientID
-	}
-	configuration, configErr := session.client.SendRequest(ctx, qmi.ServiceCAT2, session.catID, 0x002E, nil)
-	if configErr == nil && configuration.CheckResult() == nil {
-		if modeTLV := qmi.FindTLV(configuration.TLVs, 0x10); modeTLV != nil && len(modeTLV.Value) > 0 {
-			slog.Info("QMI CAT2 configuration", "mode", modeTLV.Value[0])
-		}
-	}
-	response, err := session.client.SendRequest(ctx, qmi.ServiceCAT2, session.catID, 0x0001, []qmi.TLV{
-		// Claim the raw proactive-command events implemented by this CAT2
-		// generation (bits 0..22 and 24..25). A profile can leave any STK
-		// command pending, not only REFRESH, and SGP.22 forbids profile changes
-		// while that proactive session is unanswered.
-		{Type: 0x10, Value: []byte{0xFF, 0xFF, 0x7F, 0x03}},
-		// Slot mask bit 0 selects slot 1.
-		{Type: 0x12, Value: []byte{0x01}},
-	})
-	if err != nil {
-		return fmt.Errorf("register QMI CAT2 refresh: %w", err)
-	}
-	if err := response.CheckResult(); err != nil {
-		return fmt.Errorf("register QMI CAT2 refresh: %w", err)
-	}
-	for _, tlv := range response.TLVs {
-		if tlv.Type >= 0x10 && tlv.Type <= 0x12 {
-			slog.Info("QMI CAT2 registration response", "tlv", fmt.Sprintf("0x%02X", tlv.Type), "value", fmt.Sprintf("%X", tlv.Value))
-		}
-	}
-	return nil
-}
-
-// CompleteUIMRefresh consumes refresh indications on the same QMI client that
-// registered for them.  Qualcomm requires RefreshComplete only for START
-// indications whose mode is not RESET; RESET is completed by the modem itself.
-func (session *productionQMIRadioSession) CompleteUIMRefresh(ctx context.Context) error {
-	if session == nil || session.client == nil {
-		return errors.New("QMI UIM refresh session is unavailable")
-	}
-	uim, err := session.uimService(ctx)
-	if err != nil {
-		return err
-	}
-	refreshCompleted := false
-	uimEnded := false
-	catEnded := false
-	for {
-		select {
-		case <-ctx.Done():
-			// Some firmware handles a RESET internally and never forwards an
-			// indication to this client.  A missing indication is therefore not
-			// a failed profile commit.
-			return nil
-		case event, ok := <-session.client.Events():
-			if !ok {
-				return nil
-			}
-			if event.ServiceID == qmi.ServiceCAT2 && event.MessageID == 0x0001 {
-				for _, eventTLV := range event.Packet.TLVs {
-					slog.Info("QMI CAT2 event", "tlv", fmt.Sprintf("0x%02X", eventTLV.Type), "length", len(eventTLV.Value))
-				}
-				if tlv := qmi.FindTLV(event.Packet.TLVs, 0x19); tlv != nil && len(tlv.Value) >= 4 {
-					mode := uint16(tlv.Value[0]) | uint16(tlv.Value[1])<<8
-					stage := uint16(tlv.Value[2]) | uint16(tlv.Value[3])<<8
-					slog.Info("QMI CAT2 profile refresh", "stage", stage, "mode", mode)
-					if stage == 3 {
-						return errors.New("QMI CAT2 refresh ended with failure")
-					}
-				}
-				// UIM refresh completion is not a CAT terminal response. Qualcomm
-				// delivers the raw proactive command in a command-specific TLV; send
-				// a response carrying that command's reference ID. Unsupported UI STK
-				// commands receive the standards-defined "beyond terminal
-				// capabilities" result, which still closes the proactive session.
-				for _, commandTLV := range event.Packet.TLVs {
-					if !isRawCATCommandTLV(commandTLV.Type) {
-						continue
-					}
-					ref, terminalResponse, commandType, responseOK := catProactiveTerminalResponse(commandTLV.Value)
-					if !responseOK {
-						continue
-					}
-					if err := session.sendCATTerminalResponse(ctx, ref, terminalResponse); err != nil {
-						return err
-					}
-					slog.Info("QMI CAT2 terminal response sent", "reference", ref, "command", fmt.Sprintf("0x%02X", commandType))
-					break
-				}
-				if tlv := qmi.FindTLV(event.Packet.TLVs, 0x1A); tlv != nil && len(tlv.Value) > 0 {
-					// Older MDM8916 CAT2 firmware encodes this enum in one byte;
-					// newer interface descriptions model it as a 32-bit value.
-					reason := uint32(tlv.Value[0])
-					if len(tlv.Value) >= 4 {
-						reason |= uint32(tlv.Value[1])<<8 | uint32(tlv.Value[2])<<16 | uint32(tlv.Value[3])<<24
-					}
-					slog.Info("QMI CAT2 proactive session ended", "reason", reason)
-					catEnded = true
-					if uimEnded {
-						return nil
-					}
-				}
-				continue
-			}
-			if event.Type != qmi.EventUIMRefresh {
-				continue
-			}
-			info, parseErr := qmi.ParseUIMRefreshIndication(event.Packet)
-			if parseErr != nil {
-				return parseErr
-			}
-			const (
-				refreshStageWaitForOK = uint8(0)
-				refreshStageStart     = uint8(1)
-				refreshStageSuccess   = uint8(2)
-				refreshStageFailure   = uint8(3)
-				refreshModeReset      = uint8(0)
-			)
-			slog.Info("QMI UIM profile refresh", "stage", info.Stage, "mode", info.Mode)
-			switch info.Stage {
-			case refreshStageWaitForOK:
-				// Registration without a vote advances on its own. Keep the UIM
-				// client alive for the subsequent START and END indications.
-				continue
-			case refreshStageStart:
-				if info.Mode == refreshModeReset || refreshCompleted {
-					continue
-				}
-				// libqmi intentionally uses CARD_SLOT_1 here rather than echoing
-				// the provisioning session from the indication.
-				_ = uim.RefreshComplete(ctx, qmi.UIMRefreshCompleteRequest{
-					SessionType:    qmi.UIMSessionTypeCardSlot1,
-					RefreshSuccess: true,
-				})
-				refreshCompleted = true
-				continue
-			case refreshStageSuccess:
-				uimEnded = true
-				if catEnded {
-					return nil
-				}
-				continue
-			case refreshStageFailure:
-				return errors.New("QMI UIM refresh ended with failure")
-			default:
-				continue
-			}
-		}
-	}
-}
-
-func (session *productionQMIRadioSession) sendCATTerminalResponse(ctx context.Context, reference uint32, terminalResponse []byte) error {
-	value := make([]byte, 0, 6+len(terminalResponse))
-	value = binary.LittleEndian.AppendUint32(value, reference)
-	value = binary.LittleEndian.AppendUint16(value, uint16(len(terminalResponse)))
-	value = append(value, terminalResponse...)
-	response, err := session.client.SendRequest(ctx, qmi.ServiceCAT2, session.catID, 0x0021, []qmi.TLV{
-		{Type: 0x01, Value: value},
-		{Type: 0x10, Value: []byte{0x01}}, // CAT slot 1 (not a slot mask)
-	})
-	if err != nil {
-		return fmt.Errorf("send QMI CAT2 refresh terminal response: %w", err)
-	}
-	if err := response.CheckResult(); err != nil {
-		return fmt.Errorf("send QMI CAT2 refresh terminal response: %w", err)
-	}
-	return nil
-}
-
-// catProactiveTerminalResponse extracts a raw CAT command carried as
-// {reference:uint32LE, length:uint16LE, BER-TLV command} and creates the
-// standards-shaped terminal response. VoCat has no interactive STK UI, so
-// commands other than REFRESH/MORE TIME are explicitly reported unsupported.
-func catProactiveTerminalResponse(raw []byte) (uint32, []byte, byte, bool) {
-	if len(raw) < 8 {
-		return 0, nil, 0, false
-	}
-	reference := binary.LittleEndian.Uint32(raw[:4])
-	commandLength := int(binary.LittleEndian.Uint16(raw[4:6]))
-	if commandLength <= 0 || commandLength > len(raw)-6 {
-		return 0, nil, 0, false
-	}
-	command := raw[6 : 6+commandLength]
-	if len(command) < 2 || command[0] != 0xD0 {
-		return 0, nil, 0, false
-	}
-	bodyLength, lengthBytes, ok := catBERLength(command[1:])
-	if !ok || 1+lengthBytes+bodyLength > len(command) {
-		return 0, nil, 0, false
-	}
-	body := command[1+lengthBytes : 1+lengthBytes+bodyLength]
-	for offset := 0; offset < len(body); {
-		tag := body[offset]
-		offset++
-		length, consumed, ok := catBERLength(body[offset:])
-		if !ok || offset+consumed+length > len(body) {
-			return 0, nil, 0, false
-		}
-		offset += consumed
-		value := body[offset : offset+length]
-		offset += length
-		if tag&0x7F != 0x01 || len(value) < 3 {
-			continue
-		}
-		result := byte(0x30)                      // command beyond terminal capabilities
-		if value[1] == 0x01 || value[1] == 0x02 { // REFRESH or MORE TIME
-			result = 0x00 // command performed successfully
-		}
-		terminalResponse := []byte{
-			0x81, 0x03, value[0], value[1], value[2], // command details
-			0x82, 0x02, 0x82, 0x81, // terminal -> UICC
-			0x83, 0x01, result,
-		}
-		return reference, terminalResponse, value[1], true
-	}
-	return 0, nil, 0, false
-}
-
-func catRefreshTerminalResponse(raw []byte) (uint32, []byte, bool) {
-	reference, response, commandType, ok := catProactiveTerminalResponse(raw)
-	return reference, response, ok && commandType == 0x01
-}
-
-func isRawCATCommandTLV(tag byte) bool {
-	switch tag {
-	case 0x10, 0x11, 0x12, 0x13, 0x14, 0x17, 0x18,
-		0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F,
-		0x51, 0x52, 0x53, 0x54, 0x66, 0x6A:
-		return true
-	default:
-		return false
-	}
-}
-
-func catBERLength(raw []byte) (length int, consumed int, ok bool) {
-	if len(raw) == 0 {
-		return 0, 0, false
-	}
-	switch raw[0] {
-	case 0x81:
-		if len(raw) < 2 {
-			return 0, 0, false
-		}
-		return int(raw[1]), 2, true
-	case 0x82:
-		if len(raw) < 3 {
-			return 0, 0, false
-		}
-		return int(raw[1])<<8 | int(raw[2]), 3, true
-	default:
-		if raw[0]&0x80 != 0 {
-			return 0, 0, false
-		}
-		return int(raw[0]), 1, true
-	}
-}
-
-// AcknowledgeUIMRefresh is a recovery vote for a refresh that predates this
-// QMI client. Qualcomm documents RefreshComplete as harmless when no vote is
-// pending; it lets a newly started service release a stale CAT-busy condition
-// left by an interrupted LPA/terminal transaction.
-func (session *productionQMIRadioSession) AcknowledgeUIMRefresh(ctx context.Context) error {
-	uim, err := session.uimService(ctx)
-	if err != nil {
-		return err
-	}
-	return uim.RefreshComplete(ctx, qmi.UIMRefreshCompleteRequest{
-		SessionType:    qmi.UIMSessionTypeCardSlot1,
-		RefreshSuccess: true,
-	})
-}
-
-func (session *productionQMIRadioSession) GetIMEI(ctx context.Context) (string, error) {
-	if session == nil || session.dms == nil {
-		return "", errors.New("QMI DMS identity session is unavailable")
-	}
-	info, err := session.dms.GetDeviceSerialNumbers(ctx)
-	if err != nil {
-		return "", err
-	}
-	return info.IMEI, nil
-}
-
-func (session *productionQMIRadioSession) GetOperatingMode(ctx context.Context) (qmi.OperatingMode, error) {
-	return session.dms.GetOperatingMode(ctx)
-}
-
-func (session *productionQMIRadioSession) SetOperatingMode(ctx context.Context, mode qmi.OperatingMode) error {
-	return session.dms.SetOperatingMode(ctx, mode)
-}
-
-func (session *productionQMIRadioSession) Close() error {
-	if session == nil {
-		return nil
-	}
-	var closeErrors []error
-	session.uimMu.Lock()
-	if session.uim != nil {
-		closeErrors = append(closeErrors, session.uim.Close())
-		session.uim = nil
-	}
-	session.uimMu.Unlock()
-	if session.dms != nil {
-		closeErrors = append(closeErrors, session.dms.Close())
-		session.dms = nil
-	}
-	if session.nas != nil {
-		closeErrors = append(closeErrors, session.nas.Close())
-		session.nas = nil
-	}
-	if session.client != nil && session.catID != 0 {
-		closeErrors = append(closeErrors, session.client.ReleaseClientID(qmi.ServiceCAT2, session.catID))
-		session.catID = 0
-	}
-	if session.client != nil {
-		closeErrors = append(closeErrors, session.client.Close())
-		session.client = nil
-	}
-	if session.lease != nil {
-		session.lease.Release()
-		session.lease = nil
-	}
-	return errors.Join(closeErrors...)
-}
-
-func (manager *Manager) setNativeQMIFlight(
-	ctx context.Context,
-	id string,
-	state *managedDevice,
-	enabled bool,
-) (FlightResult, bool, error) {
-	controlDevice, native, err := manager.nativeQMIControl(id)
-	if err != nil {
-		return FlightResult{}, true, err
-	}
-	if !native {
-		return FlightResult{}, false, nil
-	}
-	if manager.qmiRadioOpener == nil {
-		return FlightResult{}, true, errors.New("QMI DMS radio control is unavailable")
-	}
-	if ctx == nil {
-		ctx = context.Background()
-	}
-	openContext, cancelOpen := manager.withTimeout(ctx, manager.commandTimeout*5)
-	session, err := manager.qmiRadioOpener(openContext, controlDevice)
-	cancelOpen()
-	if err != nil {
-		return FlightResult{}, true, fmt.Errorf("open QMI DMS radio control: %w", err)
-	}
-	defer session.Close()
-
-	readContext, cancelRead := manager.withTimeout(ctx, manager.commandTimeout)
-	previousQMI, err := session.GetOperatingMode(readContext)
-	cancelRead()
-	if err != nil {
-		return FlightResult{}, true, fmt.Errorf("read QMI operating mode: %w", err)
-	}
-	previous := qmiModeAsCFUN(previousQMI)
-	targetQMI := previousQMI
-	if enabled {
-		if !isQMIRadioOffMode(previousQMI) {
-			targetQMI = qmi.ModeLowPower
-		}
-	} else if previousQMI != qmi.ModeOnline {
-		targetQMI = qmi.ModeOnline
-	}
-	changed := targetQMI != previousQMI
-	if changed {
-		setContext, cancelSet := manager.withTimeout(ctx, manager.commandTimeout)
-		err = session.SetOperatingMode(setContext, targetQMI)
-		cancelSet()
-		if err != nil {
-			return FlightResult{
-				PreviousMode: previous,
-				CurrentMode:  previous,
-				FlightMode:   isQMIRadioOffMode(previousQMI),
-				RadioOff:     isQMIRadioOffMode(previousQMI),
-			}, true, fmt.Errorf("set QMI operating mode: %w", err)
-		}
-	}
-	currentQMI, err := manager.waitForQMIRadioState(ctx, session, enabled, targetQMI)
-	if err != nil {
-		currentRadioOff := isQMIRadioOffMode(currentQMI)
-		return FlightResult{
-			PreviousMode: previous,
-			CurrentMode:  qmiModeAsCFUN(currentQMI),
-			Changed:      changed,
-			FlightMode:   currentRadioOff,
-			RadioOff:     currentRadioOff,
-		}, true, err
-	}
-	current := qmiModeAsCFUN(currentQMI)
-	currentRadioOff := isQMIRadioOffMode(currentQMI)
-	manager.updateSnapshotMode(id, state, current)
-	if !enabled && !currentRadioOff {
-		// DMS Online is only the radio half of the recovery. Continue with a
-		// background NAS registration/PS-attach reconcile after the flight-mode
-		// transition without holding the radio QMI session open.
-		manager.startNativeQMIRegistrationReconcile(id)
-	}
-	return FlightResult{
-		PreviousMode: previous,
-		CurrentMode:  current,
-		Changed:      changed,
-		FlightMode:   currentRadioOff,
-		RadioOff:     currentRadioOff,
-	}, true, nil
-}
-
-func (manager *Manager) waitForQMIRadioState(
-	ctx context.Context,
-	session qmiRadioSession,
-	radioOff bool,
-	fallback qmi.OperatingMode,
-) (qmi.OperatingMode, error) {
-	verifyTimeout := manager.commandTimeout * 2
-	if verifyTimeout < 5*time.Second {
-		verifyTimeout = 5 * time.Second
-	}
-	verifyContext, cancel := manager.withTimeout(ctx, verifyTimeout)
-	defer cancel()
-	current := fallback
-	var lastErr error
-	for {
-		mode, err := session.GetOperatingMode(verifyContext)
-		if err == nil {
-			current = mode
-			lastErr = nil
-			if qmiModeMatchesFlight(mode, radioOff) {
-				return mode, nil
-			}
-		} else {
-			lastErr = err
-		}
-		timer := time.NewTimer(250 * time.Millisecond)
-		select {
-		case <-verifyContext.Done():
-			if !timer.Stop() {
-				select {
-				case <-timer.C:
-				default:
-				}
-			}
-			if lastErr != nil {
-				return current, fmt.Errorf("verify QMI operating mode: %w", lastErr)
-			}
-			return current, fmt.Errorf(
-				"QMI operating mode did not reach requested radio state (mode %d): %w",
-				current,
-				verifyContext.Err(),
-			)
-		case <-timer.C:
-		}
-	}
-}
-
-func qmiModeMatchesFlight(mode qmi.OperatingMode, radioOff bool) bool {
-	if radioOff {
-		return isQMIRadioOffMode(mode)
-	}
-	return mode == qmi.ModeOnline
-}
-
-func isQMIRadioOffMode(mode qmi.OperatingMode) bool {
-	switch mode {
-	case qmi.ModeLowPower, qmi.ModeOffline, qmi.ModeShutdown, qmi.ModePersistLow, qmi.ModeOnlyLowPower:
-		return true
-	default:
-		return false
-	}
-}
-
-// FlightResult and Snapshot historically expose AT+CFUN values. Preserve that
-// API contract while sourcing the real radio state from QMI DMS.
-func qmiModeAsCFUN(mode qmi.OperatingMode) int {
-	switch mode {
-	case qmi.ModeOnline:
-		return 1
-	case qmi.ModeLowPower, qmi.ModePersistLow:
-		return 0
-	case qmi.ModeOffline, qmi.ModeShutdown, qmi.ModeOnlyLowPower:
-		return 7
-	default:
-		return 1
-	}
-}

internal/device/flight_qmi_cat_test.go

@@ -1,52 +0,0 @@
-package device
-
-import (
-	"bytes"
-	"testing"
-)
-
-func TestCATRefreshTerminalResponse(t *testing.T) {
-	raw := []byte{
-		0x44, 0x33, 0x22, 0x11, // reference
-		0x0B, 0x00, // command length
-		0xD0, 0x09,
-		0x81, 0x03, 0x07, 0x01, 0x00,
-		0x82, 0x02, 0x81, 0x82,
-	}
-	reference, response, ok := catRefreshTerminalResponse(raw)
-	if !ok {
-		t.Fatal("catRefreshTerminalResponse() did not recognize REFRESH")
-	}
-	if reference != 0x11223344 {
-		t.Fatalf("reference = 0x%08X", reference)
-	}
-	want := []byte{
-		0x81, 0x03, 0x07, 0x01, 0x00,
-		0x82, 0x02, 0x82, 0x81,
-		0x83, 0x01, 0x00,
-	}
-	if !bytes.Equal(response, want) {
-		t.Fatalf("response = % X, want % X", response, want)
-	}
-}
-
-func TestCATRefreshTerminalResponseRejectsOtherCommands(t *testing.T) {
-	raw := []byte{
-		0x01, 0x00, 0x00, 0x00,
-		0x0B, 0x00,
-		0xD0, 0x09,
-		0x81, 0x03, 0x01, 0x21, 0x00, // DISPLAY TEXT
-		0x82, 0x02, 0x81, 0x02,
-	}
-	if _, _, ok := catRefreshTerminalResponse(raw); ok {
-		t.Fatal("catRefreshTerminalResponse() accepted a non-REFRESH command")
-	}
-}
-
-func TestCATRefreshTerminalResponseSupportsLongBERLength(t *testing.T) {
-	command := []byte{0xD0, 0x81, 0x09, 0x81, 0x03, 0x02, 0x01, 0x01, 0x82, 0x02, 0x81, 0x82}
-	raw := append([]byte{0x02, 0x00, 0x00, 0x00, byte(len(command)), 0x00}, command...)
-	if _, _, ok := catRefreshTerminalResponse(raw); !ok {
-		t.Fatal("catRefreshTerminalResponse() rejected 0x81 BER length")
-	}
-}

internal/device/identity_qmi.go

@@ -1,63 +0,0 @@
-package device
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"vocat/internal/modem"
-)
-
-func (manager *Manager) readNativeQMIICCID(ctx context.Context, candidate modem.Candidate) (string, error) {
-	if manager == nil || manager.qmiRadioOpener == nil {
-		return "", errors.New("QMI UIM ICCID reader is unavailable")
-	}
-	if candidate.QMIControl == "" {
-		return "", errors.New("QMI UIM control device is unavailable")
-	}
-	session, err := manager.qmiRadioOpener(ctx, candidate.QMIControl)
-	if err != nil {
-		return "", fmt.Errorf("open QMI UIM control: %w", err)
-	}
-	if session == nil {
-		return "", errors.New("QMI UIM control returned an empty session")
-	}
-	defer session.Close()
-	reader, ok := session.(nativeQMIICCIDSession)
-	if !ok {
-		return "", errors.New("QMI session does not expose UIM ICCID reading")
-	}
-	value, err := reader.GetICCID(ctx)
-	if err != nil {
-		return "", fmt.Errorf("read EF_ICCID: %w", err)
-	}
-	iccid := parseICCIDIdentifier(modem.Response{Lines: []string{value}}, nil, 18, 22)
-	if iccid == "" {
-		return "", errors.New("QMI UIM returned an invalid ICCID")
-	}
-	return iccid, nil
-}
-
-func (manager *Manager) readNativeQMIIMEI(ctx context.Context, candidate modem.Candidate) (string, error) {
-	if manager.qmiRadioOpener == nil {
-		return "", errors.New("QMI DMS IMEI reader is unavailable")
-	}
-	session, err := manager.qmiRadioOpener(ctx, candidate.QMIControl)
-	if err != nil {
-		return "", err
-	}
-	defer session.Close()
-	reader, ok := session.(nativeQMIIMEISession)
-	if !ok {
-		return "", errors.New("QMI session does not expose DMS IMEI reading")
-	}
-	value, err := reader.GetIMEI(ctx)
-	if err != nil {
-		return "", fmt.Errorf("read device serial numbers: %w", err)
-	}
-	imei := parseIdentifier(modem.Response{Lines: []string{value}}, nil, 14, 17)
-	if imei == "" {
-		return "", errors.New("QMI DMS returned an invalid IMEI")
-	}
-	return imei, nil
-}

internal/device/logging.go

@@ -1,84 +0,0 @@
-package device
-
-import (
-	"regexp"
-	"strings"
-	"unicode"
-
-	"vocat/internal/modem"
-)
-
-const maxHardwareErrorDetail = 1024
-
-var longHexPayload = regexp.MustCompile(`(?i)\b[0-9a-f]{48,}\b`)
-
-// HardwareErrorDetail returns a diagnostic error suitable for persistent and
-// browser-visible logs. AT payloads can contain APDU authentication material,
-// SMS data, or APN credentials, so CommandError values retain only the command
-// name and modem final result. Very long hexadecimal payloads from wrapped
-// protocol errors are removed as a second line of defence.
-func HardwareErrorDetail(err error) string {
-	if err == nil {
-		return ""
-	}
-	detail := redactCommandErrors(err.Error(), err)
-	detail = longHexPayload.ReplaceAllString(detail, "[redacted hex payload]")
-	detail = strings.Map(func(character rune) rune {
-		if unicode.IsControl(character) && character != '\t' && character != '\n' {
-			return ' '
-		}
-		return character
-	}, strings.TrimSpace(detail))
-	runes := []rune(detail)
-	if len(runes) > maxHardwareErrorDetail {
-		detail = string(runes[:maxHardwareErrorDetail]) + "..."
-	}
-	return detail
-}
-
-func redactCommandErrors(detail string, err error) string {
-	if commandErr, ok := err.(*modem.CommandError); ok {
-		detail = strings.ReplaceAll(detail, commandErr.Error(), safeCommandError(commandErr))
-	}
-	switch wrapped := err.(type) {
-	case interface{ Unwrap() []error }:
-		for _, child := range wrapped.Unwrap() {
-			detail = redactCommandErrors(detail, child)
-		}
-	case interface{ Unwrap() error }:
-		if child := wrapped.Unwrap(); child != nil {
-			detail = redactCommandErrors(detail, child)
-		}
-	}
-	return detail
-}
-
-func safeCommandError(err *modem.CommandError) string {
-	command := safeATCommandName(err.Command)
-	final := strings.TrimSpace(err.Final)
-	if final == "" {
-		final = "unknown modem error"
-	}
-	return command + " failed: " + final
-}
-
-func safeATCommandName(command string) string {
-	command = strings.ToUpper(strings.TrimSpace(command))
-	if command == "" {
-		return "AT command"
-	}
-	if strings.HasPrefix(command, "ATD") {
-		return "ATD"
-	}
-	for index, character := range command {
-		if character == '=' || character == '?' || character == ',' ||
-			character == '"' || unicode.IsSpace(character) {
-			command = command[:index]
-			break
-		}
-	}
-	if !strings.HasPrefix(command, "AT") || len(command) > 32 {
-		return "AT command"
-	}
-	return command
-}

internal/device/logging_test.go

@@ -1,68 +0,0 @@
-package device
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"log/slog"
-	"strings"
-	"testing"
-
-	"vocat/internal/loghub"
-	"vocat/internal/modem"
-)
-
-func TestHardwareErrorDetailRedactsATPayload(t *testing.T) {
-	const payload = "00880081221000112233445566778899AABBCCDDEEFF1000112233445566778899AABBCCDDEEFF00"
-	commandErr := &modem.CommandError{
-		Command: `AT+CSIM=78,"` + payload + `"`,
-		Final:   "+CME ERROR: 13",
-		Lines:   []string{payload},
-	}
-	err := fmt.Errorf("select ISIM: %w", errors.Join(errors.New("reader reset failed"), commandErr))
-	detail := HardwareErrorDetail(err)
-	if strings.Contains(detail, payload) || strings.Contains(detail, "AT+CSIM=") {
-		t.Fatalf("hardware error exposed AT payload: %q", detail)
-	}
-	if !strings.Contains(detail, "select ISIM") || !strings.Contains(detail, "AT+CSIM failed: +CME ERROR: 13") {
-		t.Fatalf("hardware error lost useful diagnostics: %q", detail)
-	}
-}
-
-func TestManagerLogsNewHardwareFailuresWithoutPollingSpam(t *testing.T) {
-	commandError := func() error {
-		return &modem.CommandError{Command: "AT+CSQ", Final: "+CME ERROR: 13"}
-	}
-	client := &transcriptClient{steps: []clientStep{
-		{command: "AT+CSQ", err: commandError()},
-		{command: "AT+CSQ", err: commandError()},
-		{command: "AT+CSQ", response: okResponse("+CSQ: 20,99")},
-		{command: "AT+CSQ", err: commandError()},
-	}}
-	manager, id := newStartedTestManager(t, client)
-	hub := loghub.New(nil, 100)
-	manager.logger = slog.New(hub)
-
-	for attempt := 0; attempt < 2; attempt++ {
-		_, _ = manager.ExecuteAT(context.Background(), id, "AT+CSQ")
-	}
-	if entries := hub.History(10, slog.LevelDebug, ""); len(entries) != 1 {
-		t.Fatalf("continuous failure produced %d log entries, want 1", len(entries))
-	}
-	_, _ = manager.ExecuteAT(context.Background(), id, "AT+CSQ")
-	_, _ = manager.ExecuteAT(context.Background(), id, "AT+CSQ")
-
-	entries := hub.History(10, slog.LevelDebug, "")
-	if len(entries) != 2 {
-		t.Fatalf("failure after recovery produced %d total log entries, want 2", len(entries))
-	}
-	for _, entry := range entries {
-		if entry.Message != "hardware operation failed" || entry.Fields["device_id"] != id {
-			t.Fatalf("hardware log entry = %#v", entry)
-		}
-		if entry.Fields["error"] != "AT+CSQ failed: +CME ERROR: 13" {
-			t.Fatalf("hardware log detail = %#v", entry.Fields["error"])
-		}
-	}
-	client.assertDone(t)
-}

internal/device/manager.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"log/slog"
 	"sort"
 	"strings"
 	"sync"
@@ -22,7 +21,6 @@ type Options struct {
 	SMSTimeout     time.Duration
 	ScanTimeout    time.Duration
 	CardReaders    *pcsc.Service
-	Logger         *slog.Logger
 }
 
 type Manager struct {
@@ -40,15 +38,9 @@ type Manager struct {
 	smsTimeout     time.Duration
 	scanTimeout    time.Duration
 	cardReaders    *pcsc.Service
-	logger         *slog.Logger
-
-	qmiRadioOpener                qmiRadioSessionOpener
-	nativeQMIRegistrationMu       sync.Mutex
-	nativeQMIRegistrationInFlight map[string]struct{}
-
-	started      bool
-	devices      map[string]*managedDevice
-	ussdSessions map[string]ussdSession
+	started        bool
+	devices        map[string]*managedDevice
+	ussdSessions   map[string]ussdSession
 }
 
 // LockUICC and UnlockUICC allow another in-process UICC client (currently the
@@ -123,11 +115,6 @@ func NewManager(options Options) (*Manager, error) {
 		smsTimeout:     options.SMSTimeout,
 		scanTimeout:    options.ScanTimeout,
 		cardReaders:    options.CardReaders,
-		logger:         options.Logger,
-
-		qmiRadioOpener:                openQMIRadioSession,
-		nativeQMIRegistrationInFlight: make(map[string]struct{}),
-
 		devices:        make(map[string]*managedDevice),
 		ussdSessions:   make(map[string]ussdSession),
 		esimRecoveries: make(map[string]chan struct{}),
@@ -245,20 +232,7 @@ func (manager *Manager) Discover(ctx context.Context) ([]Device, error) {
 		state.opMu.Unlock()
 	}
 	manager.resetChangedClients()
-
-	// List retains previously discovered devices so configured hardware can be
-	// rendered as offline after it is unplugged. Discover, however, is a fresh
-	// physical scan and must only return devices that are present now. Returning
-	// the retained entries here allowed an unplugged modem to be selected and
-	// added again from the device discovery screen.
-	devices := manager.List()
-	present := devices[:0]
-	for _, entry := range devices {
-		if entry.Discovered {
-			present = append(present, entry)
-		}
-	}
-	return present, nil
+	return manager.List(), nil
 }
 
 func (manager *Manager) resetChangedClients() {
@@ -377,11 +351,10 @@ func (manager *Manager) setResult(
 	err error,
 ) {
 	manager.mu.Lock()
+	defer manager.mu.Unlock()
 	if manager.devices[id] != state {
-		manager.mu.Unlock()
 		return
 	}
-	previousError := state.lastError
 	if snapshot != nil {
 		value := *snapshot
 		value.Warnings = append([]string(nil), snapshot.Warnings...)
@@ -393,19 +366,6 @@ func (manager *Manager) setResult(
 	} else {
 		state.lastError = ""
 	}
-	shouldLog := err != nil && manager.logger != nil && previousError != err.Error()
-	backend := state.backend
-	hardwareKind := state.candidate.HardwareKind
-	manager.mu.Unlock()
-	if shouldLog {
-		manager.logger.Warn(
-			"hardware operation failed",
-			"device_id", id,
-			"backend", backend,
-			"hardware_kind", hardwareKind,
-			"error", HardwareErrorDetail(err),
-		)
-	}
 }
 
 func (manager *Manager) candidateFor(state *managedDevice) modem.Candidate {
@@ -451,14 +411,7 @@ func (manager *Manager) Refresh(ctx context.Context, id string) (Snapshot, error
 		return Snapshot{}, err
 	}
 	previousICCID := state.lastICCID
-	var previousSnapshot *Snapshot
-	manager.mu.RLock()
-	if state.snapshot != nil {
-		copy := *state.snapshot
-		previousSnapshot = &copy
-	}
-	manager.mu.RUnlock()
-	snapshot, err := manager.readSnapshot(ctx, id, candidate, backend, previousICCID, previousSnapshot, client)
+	snapshot, err := manager.readSnapshot(ctx, id, candidate, backend, previousICCID, client)
 	if err == nil && strings.TrimSpace(snapshot.ICCID) != "" {
 		state.lastICCID = strings.TrimSpace(snapshot.ICCID)
 	}
@@ -494,7 +447,6 @@ func (manager *Manager) refreshCardReader(ctx context.Context, id string, state
 		result.ICCID = card.Identity.ICCID
 		result.IMSI = card.Identity.IMSI
 		result.SPN = card.Identity.SPN
-		result.MNCLength = card.Identity.MNCLength
 		result.SIMChanged = previousICCID != "" && !strings.EqualFold(previousICCID, result.ICCID)
 		state.lastICCID = result.ICCID
 	}

internal/device/manager_test.go

@@ -45,29 +45,6 @@ func TestManagerDiscoversWiFiCallingOnlyReaderWithoutATPort(t *testing.T) {
 	}
 }
 
-func TestManagerDiscoverReturnsOnlyCurrentlyPresentDevices(t *testing.T) {
-	manager, id := newStartedTestManager(t, nil)
-	if devices := manager.List(); len(devices) != 1 || devices[0].ID != id || !devices[0].Discovered {
-		t.Fatalf("initial devices = %#v", devices)
-	}
-
-	manager.discoverer = staticDiscoverer{}
-	present, err := manager.Discover(context.Background())
-	if err != nil {
-		t.Fatalf("Discover after unplug: %v", err)
-	}
-	if len(present) != 0 {
-		t.Fatalf("present devices after unplug = %#v, want none", present)
-	}
-
-	// The retained entry is still available to the configured-device dashboard,
-	// but is explicitly offline and cannot be offered by fresh discovery.
-	retained := manager.List()
-	if len(retained) != 1 || retained[0].ID != id || retained[0].Discovered {
-		t.Fatalf("retained devices after unplug = %#v", retained)
-	}
-}
-
 func TestManagerRefreshBuildsEC20Snapshot(t *testing.T) {
 	client := &transcriptClient{steps: []clientStep{
 		{
@@ -87,12 +64,6 @@ func TestManagerRefreshBuildsEC20Snapshot(t *testing.T) {
 		{command: "AT+QCCID", response: okResponse("+QCCID: 8986001234567890123F")},
 		{command: "AT+CIMI", response: okResponse("460001234567890")},
 		{command: "AT+CRSM=176,28486,0,0,17", response: okResponse(`+CRSM: 144,0,"00434D4343FFFFFFFFFFFFFFFFFFFFFFFF"`)},
-		{command: "AT+CRSM=192,28589,0,0,0", response: okResponse(`+CRSM: 144,0,"620680020004FFFF"`)},
-		{command: "AT+CRSM=176,28589,0,0,4", response: okResponse(`+CRSM: 144,0,"00000002"`)},
-		{command: "AT+CRSM=192,28478,0,0,0", response: okResponse(`+CRSM: 144,0,"620680020002FFFF"`)},
-		{command: "AT+CRSM=176,28478,0,0,2", response: okResponse(`+CRSM: 144,0,"0102"`)},
-		{command: "AT+CRSM=192,28479,0,0,0", response: okResponse(`+CRSM: 144,0,"620680020001FFFF"`)},
-		{command: "AT+CRSM=176,28479,0,0,1", response: okResponse(`+CRSM: 144,0,"FF"`)},
 		{command: "AT+CSQ", response: okResponse("+CSQ: 20,99")},
 		{
 			command: `AT+QENG="servingcell"`,
@@ -141,8 +112,7 @@ func TestManagerRefreshBuildsEC20Snapshot(t *testing.T) {
 	}
 	if snapshot.IMEI != "867123456789012" ||
 		snapshot.ICCID != "8986001234567890123" ||
-		snapshot.IMSI != "460001234567890" || snapshot.SPN != "CMCC" ||
-		snapshot.MNCLength != 2 || snapshot.GID1 != "0102" || snapshot.GID2 != "" {
+		snapshot.IMSI != "460001234567890" || snapshot.SPN != "CMCC" {
 		t.Fatalf("subscriber identifiers = %#v", snapshot)
 	}
 	if !snapshot.ModeKnown || snapshot.OperatingMode != 1 ||
@@ -164,58 +134,6 @@ func TestManagerRefreshBuildsEC20Snapshot(t *testing.T) {
 	client.assertDone(t)
 }
 
-func TestManagerRefreshReadsNativeWWANICCIDThroughQMIUIM(t *testing.T) {
-	client := &transcriptClient{steps: []clientStep{
-		{command: "ATI", response: okResponse("Qualcomm", "PCIe/MHI WWAN modem", "Revision: native-410")},
-		{command: "AT+CPIN?", response: okResponse("+CPIN: READY")},
-		{command: "AT+CCID", response: modem.Response{Final: "ERROR"}, err: errors.New("CCID unsupported")},
-		{command: "AT+QCCID", response: modem.Response{Final: "ERROR"}, err: errors.New("QCCID unsupported")},
-		{command: "AT+CIMI", response: okResponse("234159611274418")},
-		{command: "AT+CRSM=176,28486,0,0,17", response: okResponse(`+CRSM: 106,130,""`)},
-		{command: "AT+CRSM=192,28589,0,0,0", response: okResponse(`+CRSM: 106,130,""`)},
-		{command: "AT+CRSM=192,28478,0,0,0", response: okResponse(`+CRSM: 106,130,""`)},
-		{command: "AT+CRSM=192,28479,0,0,0", response: okResponse(`+CRSM: 106,130,""`)},
-		{command: "AT+CSQ", response: okResponse("+CSQ: 99,99")},
-		{command: `AT+QENG="servingcell"`, response: okResponse(`+QENG: "servingcell","SEARCH"`)},
-		{command: "AT+COPS?", response: okResponse("+COPS: 0")},
-		{command: "AT+CEREG?", response: okResponse("+CEREG: 0,2")},
-		{command: "AT+CFUN?", response: okResponse("+CFUN: 1")},
-		{command: "AT+CNUM", response: okResponse(`+CNUM: "","+8613800138000",145`)},
-	}}
-	manager, err := NewManager(Options{
-		Discoverer: staticDiscoverer{candidates: []modem.Candidate{{
-			ID:               "mhi-wwan0",
-			Product:          "PCIe/MHI WWAN modem",
-			QMIControl:       "/dev/wwan0qmi0",
-			NetworkInterface: "wwan0",
-			ATPort:           modem.Port{Path: "/dev/wwan0at0", Name: "wwan0at0", Role: modem.PortRoleAT},
-		}}},
-		Opener: &staticOpener{client: client},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := manager.Start(context.Background()); err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() { _ = manager.Stop(context.Background()) })
-	manager.qmiRadioOpener = func(context.Context, string) (qmiRadioSession, error) {
-		return &fakeQMIRadioSession{iccid: "89441000400316034372", imei: "861716070416510"}, nil
-	}
-	if err := manager.SetBackend("mhi-wwan0", "qmi"); err != nil {
-		t.Fatal(err)
-	}
-
-	snapshot, err := manager.Refresh(context.Background(), "mhi-wwan0")
-	if err != nil {
-		t.Fatalf("Refresh: %v", err)
-	}
-	if snapshot.ICCID != "89441000400316034372" || snapshot.IMEI != "861716070416510" || !snapshot.SIMReady {
-		t.Fatalf("native QMI identity = %#v", snapshot)
-	}
-	client.assertDone(t)
-}
-
 func TestParseSPNASCIIAndUCS2(t *testing.T) {
 	if got := parseSPN(okResponse(`+CRSM: 144,0,"004C6562617261FFFFFFFFFFFFFFFFFFFF"`)); got != "Lebara" {
 		t.Fatalf("ASCII SPN = %q", got)
@@ -280,12 +198,6 @@ func TestManagerForcesRFOffBeforeInspectingChangedSIMNetwork(t *testing.T) {
 		{command: "AT+CFUN=4", response: okResponse()},
 		{command: "AT+CIMI", response: okResponse("234150000000002")},
 		{command: "AT+CRSM=176,28486,0,0,17", response: okResponse(`+CRSM: 144,0,"004C6562617261FFFFFFFFFFFFFFFFFFFF"`)},
-		{command: "AT+CRSM=192,28589,0,0,0", response: okResponse(`+CRSM: 144,0,"620680020004FFFF"`)},
-		{command: "AT+CRSM=176,28589,0,0,4", response: okResponse(`+CRSM: 144,0,"00000002"`)},
-		{command: "AT+CRSM=192,28478,0,0,0", response: okResponse(`+CRSM: 144,0,"620680020001FFFF"`)},
-		{command: "AT+CRSM=176,28478,0,0,1", response: okResponse(`+CRSM: 144,0,"FF"`)},
-		{command: "AT+CRSM=192,28479,0,0,0", response: okResponse(`+CRSM: 144,0,"620680020001FFFF"`)},
-		{command: "AT+CRSM=176,28479,0,0,1", response: okResponse(`+CRSM: 144,0,"FF"`)},
 		{command: "AT+CSQ", response: okResponse("+CSQ: 99,99")},
 		{command: `AT+QENG="servingcell"`, response: okResponse(`+QENG: "servingcell","SEARCH"`)},
 		{command: "AT+COPS?", response: okResponse("+COPS: 0")},

internal/device/region.go

@@ -22,44 +22,19 @@ var BlockedMCCs = map[string]string{
 // code. The MCC is the leading three digits and the MNC the following two or
 // three. Empty strings are returned for an unusable IMSI.
 func CardMCCMNC(imsi string) (mcc string, mnc string) {
-	return CardMCCMNCWithLength(imsi, 0)
-}
-
-// CardMCCMNCWithLength uses the MNC length advertised by EF_AD when available.
-// Without it the historical three-digit behavior is retained for callers that
-// have only an IMSI.
-func CardMCCMNCWithLength(imsi string, mncLength int) (mcc string, mnc string) {
 	digits := strings.TrimSpace(imsi)
 	if len(digits) < 5 ||
 		strings.IndexFunc(digits, func(r rune) bool { return !unicode.IsDigit(r) }) >= 0 {
 		return "", ""
 	}
-	if IsPlaceholderIMSI(digits) {
-		return "", ""
-	}
 	mcc = digits[:3]
 	mnc = digits[3:]
-	if mncLength != 2 && mncLength != 3 {
-		mncLength = 3
-	}
-	if len(mnc) > mncLength {
-		mnc = mnc[:mncLength]
+	if len(mnc) > 3 {
+		mnc = mnc[:3]
 	}
 	return mcc, mnc
 }
 
-// IsPlaceholderIMSI recognizes an unprovisioned/test identity structurally,
-// without tying the decision to a vendor-specific hard-coded ICCID. A valid
-// subscriber identity cannot consist of an MCC followed only by zeroes; white
-// cards commonly ship in exactly that state before a real profile is enabled.
-func IsPlaceholderIMSI(imsi string) bool {
-	digits := strings.TrimSpace(imsi)
-	if len(digits) < 10 || strings.IndexFunc(digits, func(r rune) bool { return !unicode.IsDigit(r) }) >= 0 {
-		return false
-	}
-	return strings.Trim(digits[3:], "0") == ""
-}
-
 // RegionBlockReason returns a human-readable reason when the SIM identified by
 // the IMSI belongs to a blocked region. It returns an empty string when the
 // card is allowed or when the IMSI is unavailable: only a confirmed blocked

internal/device/region_test.go

@@ -23,9 +23,6 @@ func TestCardMCCMNC(t *testing.T) {
 	if mcc, _ := CardMCCMNC("460001234567890"); mcc != "460" {
 		t.Fatalf("CardMCCMNC mcc = %q, want 460", mcc)
 	}
-	if mcc, mnc := CardMCCMNCWithLength("454006395879502", 2); mcc != "454" || mnc != "00" {
-		t.Fatalf("CardMCCMNCWithLength = (%q, %q), want (454, 00)", mcc, mnc)
-	}
 	for _, bad := range []string{"", "4600", "4600X1234"} {
 		if mcc, _ := CardMCCMNC(bad); mcc != "" {
 			t.Fatalf("CardMCCMNC(%q) mcc = %q, want empty", bad, mcc)
@@ -33,22 +30,6 @@ func TestCardMCCMNC(t *testing.T) {
 	}
 }
 
-func TestPlaceholderIMSIIsNotTreatedAsARealCarrier(t *testing.T) {
-	t.Parallel()
-	if !IsPlaceholderIMSI("460000000000000") {
-		t.Fatal("all-zero subscriber identity should be treated as an unprovisioned placeholder")
-	}
-	if IsPlaceholderIMSI("460001234567890") {
-		t.Fatal("real subscriber identity was classified as a placeholder")
-	}
-	if mcc, mnc := CardMCCMNC("460000000000000"); mcc != "" || mnc != "" {
-		t.Fatalf("placeholder MCC/MNC = %q/%q, want empty", mcc, mnc)
-	}
-	if reason := RegionBlockReason("460000000000000"); reason != "" {
-		t.Fatalf("placeholder identity was region-blocked: %s", reason)
-	}
-}
-
 func TestRegionBlockReason(t *testing.T) {
 	t.Parallel()
 	for _, imsi := range []string{"460001234567890", "461001234567890"} {

internal/device/registration_native_qmi.go

@@ -1,702 +0,0 @@
-package device
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/iniwex5/quectel-qmi-go/pkg/qmi"
-
-	"vocat/internal/modem"
-)
-
-// nativeQMIRegistrationSession is the QMI NAS control surface used by
-// OpenStick WWAN devices.  It deliberately stays separate from
-// qmiRadioSession so AT-only devices and existing radio-control fakes do not
-// acquire a mandatory NAS implementation.
-type nativeQMIRegistrationSession interface {
-	qmiRadioSession
-	GetServingSystem(context.Context) (*qmi.ServingSystem, error)
-	GetSystemSelectionPreference(context.Context) (*qmi.SystemSelectionPreference, error)
-	SetSystemSelectionPreference(context.Context, qmi.SystemSelectionPreference) error
-	InitiateNetworkRegister(context.Context, qmi.NASInitiateNetworkRegisterRequest) error
-	ForceNetworkSearch(context.Context) error
-	AttachDetach(context.Context, bool) error
-}
-
-const (
-	nativeQMIRegistrationPollInterval               = 2 * time.Second
-	nativeQMIRegistrationMaxAttempts                = 45
-	nativeQMIRegistrationRadioCycleAfterAttempts    = 30
-	nativeQMIRegistrationUnsupportedCycleAfterTries = 3
-	nativeQMIRegistrationBackgroundTimeout          = 45 * time.Second
-)
-
-func isNativeQMICandidate(candidate modem.Candidate) bool {
-	deviceID := strings.TrimSpace(candidate.ID)
-	control := strings.TrimSpace(candidate.QMIControl)
-	return nativeQMIControlMatches(deviceID, control)
-}
-
-func nativeQMIControlMatches(deviceID, control string) bool {
-	deviceID = strings.TrimSpace(deviceID)
-	control = strings.TrimSpace(control)
-	if deviceID == "" || control == "" {
-		return false
-	}
-	prefix := ""
-	switch {
-	case strings.HasPrefix(deviceID, "wwan"):
-		prefix = deviceID + "qmi"
-	case strings.HasPrefix(deviceID, "mhi-wwan"):
-		prefix = "wwan" + strings.TrimPrefix(deviceID, "mhi-wwan") + "qmi"
-	default:
-		return false
-	}
-	return strings.HasPrefix(filepath.Base(control), prefix)
-}
-
-func (manager *Manager) openNativeQMIRegistration(
-	ctx context.Context,
-	candidate modem.Candidate,
-) (nativeQMIRegistrationSession, error) {
-	if manager == nil || manager.qmiRadioOpener == nil {
-		return nil, errors.New("QMI NAS registration is unavailable")
-	}
-	control := strings.TrimSpace(candidate.QMIControl)
-	if control == "" {
-		return nil, errors.New("QMI NAS registration control device is unavailable")
-	}
-	session, err := manager.qmiRadioOpener(ctx, control)
-	if err != nil {
-		return nil, err
-	}
-	nas, ok := session.(nativeQMIRegistrationSession)
-	if !ok {
-		_ = session.Close()
-		return nil, errors.New("QMI radio session does not expose NAS registration control")
-	}
-	return nas, nil
-}
-
-// startNativeQMIRegistrationReconcile continues registration after a radio
-// transition. Bringing DMS online only proves that the RF switch completed;
-// NAS may still report searching or PS detached seconds later, so the
-// registration sequence continues after SetFlight returns. The per-device
-// guard prevents repeated UI/poll callbacks from opening competing sessions.
-func (manager *Manager) startNativeQMIRegistrationReconcile(id string) bool {
-	if manager == nil {
-		return false
-	}
-	state, err := manager.lookup(id)
-	if err != nil {
-		return false
-	}
-	candidate := manager.candidateFor(state)
-	if !isNativeQMICandidate(candidate) {
-		return false
-	}
-	manager.nativeQMIRegistrationMu.Lock()
-	if _, running := manager.nativeQMIRegistrationInFlight[id]; running {
-		manager.nativeQMIRegistrationMu.Unlock()
-		return false
-	}
-	manager.nativeQMIRegistrationInFlight[id] = struct{}{}
-	manager.nativeQMIRegistrationMu.Unlock()
-	go func() {
-		defer func() {
-			manager.nativeQMIRegistrationMu.Lock()
-			delete(manager.nativeQMIRegistrationInFlight, id)
-			manager.nativeQMIRegistrationMu.Unlock()
-		}()
-		ctx, cancel := context.WithTimeout(context.Background(), nativeQMIRegistrationBackgroundTimeout)
-		defer cancel()
-		_, _ = manager.ReRegisterOperator(ctx, id)
-	}()
-	return true
-}
-
-func qmiOperatorSelectionFromPreference(pref *qmi.SystemSelectionPreference) (OperatorSelection, error) {
-	if pref == nil {
-		return OperatorSelection{}, errors.New("QMI returned an empty system-selection preference")
-	}
-	accessTechnology := qmiAccessTechnologyFromModePreference(pref.ModePreference)
-	if pref.HasManualNetworkSelection {
-		mcc := fmt.Sprintf("%03d", pref.ManualNetworkSelection.MCC)
-		mncWidth := 2
-		if pref.ManualNetworkSelection.IncludesPCSDigit {
-			mncWidth = 3
-		}
-		mnc := fmt.Sprintf("%0*d", mncWidth, pref.ManualNetworkSelection.MNC)
-		return OperatorSelection{
-			Mode:             1,
-			Format:           2,
-			Operator:         mcc + mnc,
-			AccessTechnology: accessTechnology,
-		}, nil
-	}
-	return OperatorSelection{Mode: 0, AccessTechnology: accessTechnology}, nil
-}
-
-func qmiManualRegisterRequest(
-	plmn string,
-	accessTechnologyValue *int,
-) (qmi.NASInitiateNetworkRegisterRequest, error) {
-	mcc, mnc, includesPCSDigit, err := qmiPLMNParts(plmn)
-	if err != nil {
-		return qmi.NASInitiateNetworkRegisterRequest{}, err
-	}
-	rat := uint8(0)
-	if accessTechnologyValue != nil {
-		if *accessTechnologyValue < 0 || *accessTechnologyValue > 9 {
-			return qmi.NASInitiateNetworkRegisterRequest{}, errors.New("invalid operator access technology")
-		}
-		rat = qmiRATFromATCode(*accessTechnologyValue)
-		if rat == 0 {
-			return qmi.NASInitiateNetworkRegisterRequest{}, errors.New("unsupported operator access technology")
-		}
-	}
-	return qmi.NASInitiateNetworkRegisterRequest{
-		Mode:              qmi.NASNetworkRegisterManual,
-		MCC:               mcc,
-		MNC:               mnc,
-		IncludesPCSDigit:  includesPCSDigit,
-		RadioAccessTech:   rat,
-		ChangeDuration:    qmi.NASChangeDurationPermanent,
-		HasChangeDuration: true,
-	}, nil
-}
-
-func qmiPLMNParts(plmn string) (mcc, mnc uint16, includesPCSDigit bool, err error) {
-	plmn = strings.TrimSpace(plmn)
-	if !decimalPLMN(plmn) {
-		return 0, 0, false, errors.New("operator PLMN must contain 5 or 6 digits")
-	}
-	mccValue, parseErr := strconv.ParseUint(plmn[:3], 10, 16)
-	if parseErr != nil {
-		return 0, 0, false, fmt.Errorf("parse operator MCC: %w", parseErr)
-	}
-	mncValue, parseErr := strconv.ParseUint(plmn[3:], 10, 16)
-	if parseErr != nil {
-		return 0, 0, false, fmt.Errorf("parse operator MNC: %w", parseErr)
-	}
-	return uint16(mccValue), uint16(mncValue), len(plmn) == 6, nil
-}
-
-func qmiManualSelectionPreference(plmn string) (qmi.SystemSelectionPreference, qmi.ManualNetworkSelection, error) {
-	return qmiManualSelectionPreferenceWithRAT(plmn, nil)
-}
-
-func qmiManualSelectionPreferenceWithRAT(
-	plmn string,
-	accessTechnologyValue *int,
-) (qmi.SystemSelectionPreference, qmi.ManualNetworkSelection, error) {
-	mcc, mnc, includesPCSDigit, err := qmiPLMNParts(plmn)
-	if err != nil {
-		return qmi.SystemSelectionPreference{}, qmi.ManualNetworkSelection{}, err
-	}
-	selection := qmi.ManualNetworkSelection{
-		MCC:              mcc,
-		MNC:              mnc,
-		IncludesPCSDigit: includesPCSDigit,
-	}
-	pref := qmi.SystemSelectionPreference{
-		NetworkSelectionPreference:    qmi.NASNetworkSelectionManual,
-		HasNetworkSelectionPreference: true,
-		ManualNetworkSelection:        selection,
-		HasManualNetworkSelection:     true,
-		ChangeDuration:                qmi.NASChangeDurationPermanent,
-		HasChangeDuration:             true,
-	}
-	if accessTechnologyValue != nil {
-		modePreference, ok := qmiModePreferenceFromATCode(*accessTechnologyValue)
-		if !ok {
-			return qmi.SystemSelectionPreference{}, qmi.ManualNetworkSelection{}, errors.New("unsupported operator access technology")
-		}
-		pref.ModePreference = modePreference
-		pref.HasModePreference = true
-	}
-	return pref, selection, nil
-}
-
-func qmiRATFromATCode(value int) uint8 {
-	switch value {
-	case 0, 3: // GSM / EDGE
-		return 0x04
-	case 2, 4, 5, 6: // UTRAN / HSDPA / HSUPA / HSPA
-		return 0x05
-	case 7: // LTE
-		return 0x08
-	case 9: // NR5G
-		return 0x0C
-	default:
-		return 0
-	}
-}
-
-func qmiModePreferenceFromATCode(value int) (uint16, bool) {
-	switch value {
-	case 0, 3: // GSM / EDGE
-		return qmi.NASRatModePreferenceGSM, true
-	case 2, 4, 5, 6: // UTRAN / HSDPA / HSUPA / HSPA
-		return qmi.NASRatModePreferenceUMTS, true
-	case 7: // LTE
-		return qmi.NASRatModePreferenceLTE, true
-	case 9: // NR5G
-		return qmi.NASRatModePreferenceNR5G, true
-	default:
-		return 0, false
-	}
-}
-
-func qmiRATFromServingRadioInterface(value uint8) uint8 {
-	switch value {
-	case 4, 5, 8:
-		return value
-	case 10: // NAS serving-system NR5G value
-		return 0x0C
-	default:
-		return 0
-	}
-}
-
-func qmiRATFromModePreference(value uint16) uint8 {
-	switch {
-	case value&qmi.NASRatModePreferenceNR5G != 0:
-		return 0x0C
-	case value&qmi.NASRatModePreferenceLTE != 0:
-		return 0x08
-	case value&qmi.NASRatModePreferenceUMTS != 0:
-		return 0x05
-	case value&qmi.NASRatModePreferenceGSM != 0:
-		return 0x04
-	default:
-		return 0
-	}
-}
-
-func qmiAccessTechnologyFromModePreference(value uint16) string {
-	switch {
-	case value&qmi.NASRatModePreferenceNR5G != 0:
-		return "NR5G"
-	case value&qmi.NASRatModePreferenceLTE != 0:
-		return "LTE"
-	case value&qmi.NASRatModePreferenceUMTS != 0:
-		return "UTRAN"
-	case value&qmi.NASRatModePreferenceGSM != 0:
-		return "GSM"
-	default:
-		return ""
-	}
-}
-
-func qmiRegistrationRequestAutomatic() qmi.NASInitiateNetworkRegisterRequest {
-	return qmi.NASInitiateNetworkRegisterRequest{
-		Mode:              qmi.NASNetworkRegisterAutomatic,
-		ChangeDuration:    qmi.NASChangeDurationPermanent,
-		HasChangeDuration: true,
-	}
-}
-
-func qmiSelectionAutomaticPreference() qmi.SystemSelectionPreference {
-	return qmi.SystemSelectionPreference{
-		NetworkSelectionPreference:    qmi.NASNetworkSelectionAutomatic,
-		HasNetworkSelectionPreference: true,
-		ChangeDuration:                qmi.NASChangeDurationPermanent,
-		HasChangeDuration:             true,
-	}
-}
-
-func isUnsupportedQMIRegistrationCommand(err error, messageID uint16) bool {
-	qmiErr := qmi.GetQMIError(err)
-	if qmiErr == nil || qmiErr.Service != qmi.ServiceNAS || qmiErr.MessageID != messageID {
-		return false
-	}
-	switch qmiErr.ErrorCode {
-	case qmi.QMIErrMalformedMsg,
-		qmi.QMIErrInvalidRegisterAction,
-		qmi.QMIErrNoEffect,
-		qmi.QMIErrNotSupported,
-		qmi.QMIErrInvalidQmiCmd,
-		qmi.QMIErrOpDeviceUnsupported:
-		return true
-	default:
-		return false
-	}
-}
-
-func isUnsupportedQMIForceSearch(err error) bool {
-	qmiErr := qmi.GetQMIError(err)
-	if qmiErr == nil || qmiErr.Service != qmi.ServiceNAS || qmiErr.MessageID != qmi.NASForceNetworkSearch {
-		return false
-	}
-	return qmiErr.ErrorCode == qmi.QMIErrNotSupported ||
-		qmiErr.ErrorCode == qmi.QMIErrInvalidQmiCmd ||
-		qmiErr.ErrorCode == qmi.QMIErrOpDeviceUnsupported
-}
-
-func isUnsupportedQMISelectionCommand(err error) bool {
-	qmiErr := qmi.GetQMIError(err)
-	if qmiErr == nil || qmiErr.Service != qmi.ServiceNAS || qmiErr.MessageID != qmi.NASSetSystemSelectionPreference {
-		return false
-	}
-	switch qmiErr.ErrorCode {
-	case qmi.QMIErrMalformedMsg,
-		qmi.QMIErrInvalidRegisterAction,
-		qmi.QMIErrNoEffect,
-		qmi.QMIErrNotSupported,
-		qmi.QMIErrInvalidQmiCmd,
-		qmi.QMIErrOpDeviceUnsupported:
-		return true
-	default:
-		return false
-	}
-}
-
-func qmiRegistrationStateRegistered(state qmi.RegistrationState) bool {
-	return state == qmi.RegStateRegistered || state == qmi.RegStateRoaming
-}
-
-func nativeQMIRegistrationRadioCycleThreshold(forceSearchUnsupported bool) int {
-	if forceSearchUnsupported {
-		return nativeQMIRegistrationUnsupportedCycleAfterTries
-	}
-	return nativeQMIRegistrationRadioCycleAfterAttempts
-}
-
-// triggerNativeQMIManualRegistration applies the manual preference that was
-// written by the caller and starts a fresh NAS search.  On the OpenStick 410
-// firmware, NAS_FORCE_NETWORK_SEARCH is the reliable trigger; sending
-// NAS_INITIATE_NETWORK_REGISTER with RadioAccessTech=0 is rejected as an
-// invalid profile.  Older firmware may not expose force-search, so fall back
-// to an explicit RAT (or the current serving RAT) when that command is not
-// supported.
-func triggerNativeQMIManualRegistration(
-	ctx context.Context,
-	session nativeQMIRegistrationSession,
-	request *qmi.NASInitiateNetworkRegisterRequest,
-	serving *qmi.ServingSystem,
-) (forceSearchIssued bool, forceSearchUnsupported bool, err error) {
-	if request == nil {
-		return false, false, errors.New("QMI manual registration request is unavailable")
-	}
-	if err := session.ForceNetworkSearch(ctx); err == nil {
-		return true, false, nil
-	} else if !isUnsupportedQMIForceSearch(err) {
-		return false, false, fmt.Errorf("force QMI network search: %w", err)
-	}
-
-	forceSearchUnsupported = true
-	if request.RadioAccessTech == 0 && serving != nil {
-		request.RadioAccessTech = qmiRATFromServingRadioInterface(serving.RadioInterface)
-	}
-	if request.RadioAccessTech == 0 {
-		return false, true, errors.New("QMI manual registration requires a supported radio access technology")
-	}
-	if err := session.InitiateNetworkRegister(ctx, *request); err != nil {
-		return false, true, fmt.Errorf("initiate manual QMI network registration: %w", err)
-	}
-	return false, true, nil
-}
-
-// ensureNativeQMIRegistration runs the NAS registration sequence used on
-// OpenStick.  The modem's AT+COPS surface on this firmware only changes
-// presentation; it does not reliably drive this NAS state machine.
-func ensureNativeQMIRegistration(
-	ctx context.Context,
-	session nativeQMIRegistrationSession,
-	request qmi.NASInitiateNetworkRegisterRequest,
-	setAutomatic bool,
-) error {
-	return ensureNativeQMIRegistrationForTarget(ctx, session, request, setAutomatic, nil)
-}
-
-// ensureNativeQMIRegistrationForTarget is the manual-lock variant of the
-// registration sequence. A modem can remain registered on the old PLMN while
-// it processes a new manual request, so a successful registered/PS-attached
-// state is only authoritative when it is on the requested PLMN.
-func ensureNativeQMIRegistrationForTarget(
-	ctx context.Context,
-	session nativeQMIRegistrationSession,
-	request qmi.NASInitiateNetworkRegisterRequest,
-	setAutomatic bool,
-	target *qmi.ManualNetworkSelection,
-) error {
-	if ctx == nil {
-		ctx = context.Background()
-	}
-	if session == nil {
-		return errors.New("QMI NAS registration session is unavailable")
-	}
-	if request.Mode == 0 {
-		request = qmiRegistrationRequestAutomatic()
-	}
-
-	mode, err := session.GetOperatingMode(ctx)
-	if err != nil {
-		return fmt.Errorf("read QMI operating mode: %w", err)
-	}
-	if mode == qmi.ModeLowPower || mode == qmi.ModeOffline || mode == qmi.ModeShutdown || mode == qmi.ModeReset {
-		if err := session.SetOperatingMode(ctx, qmi.ModeOnline); err != nil {
-			return fmt.Errorf("restore QMI online mode: %w", err)
-		}
-		if err := waitNativeQMIRegistration(ctx); err != nil {
-			return fmt.Errorf("wait for QMI online mode: %w", err)
-		}
-		mode, err = session.GetOperatingMode(ctx)
-		if err != nil {
-			return fmt.Errorf("recheck QMI operating mode: %w", err)
-		}
-		if mode == qmi.ModeLowPower || mode == qmi.ModeOffline || mode == qmi.ModeShutdown || mode == qmi.ModeReset {
-			return fmt.Errorf("QMI operating mode remained non-online after recovery: %d", mode)
-		}
-	}
-
-	if setAutomatic {
-		if err := session.SetSystemSelectionPreference(ctx, qmiSelectionAutomaticPreference()); err != nil {
-			// Some OpenStick firmware accepts the preference but reports an
-			// unsupported result for an optional NAS TLV. The explicit NAS register
-			// below remains the authoritative trigger.
-			if !isUnsupportedQMISelectionCommand(err) {
-				return fmt.Errorf("restore automatic QMI NAS selection: %w", err)
-			}
-		}
-	}
-	registerIssued := false
-	forceSearchIssued := false
-	radioCycleIssued := false
-	forceSearchUnsupported := false
-	manualTarget := target != nil && request.Mode == qmi.NASNetworkRegisterManual
-	for attempt := 1; attempt <= nativeQMIRegistrationMaxAttempts; attempt++ {
-		serving, servingErr := session.GetServingSystem(ctx)
-		if servingErr != nil {
-			if err := waitNativeQMIRegistration(ctx); err != nil {
-				return fmt.Errorf("read QMI serving system: %w", servingErr)
-			}
-			continue
-		}
-		if serving == nil {
-			return errors.New("QMI serving system returned no data")
-		}
-		if qmiRegistrationStateRegistered(serving.RegistrationState) {
-			if target == nil || qmiServingSystemMatchesTarget(serving, *target) {
-				if serving.PSAttached {
-					return nil
-				}
-				if err := session.AttachDetach(ctx, true); err != nil {
-					return fmt.Errorf("attach QMI packet service: %w", err)
-				}
-			} else if !registerIssued {
-				if manualTarget {
-					var triggerErr error
-					forceSearchIssued, forceSearchUnsupported, triggerErr = triggerNativeQMIManualRegistration(
-						ctx, session, &request, serving,
-					)
-					if triggerErr != nil {
-						return triggerErr
-					}
-				} else if err := session.InitiateNetworkRegister(ctx, request); err != nil {
-					return fmt.Errorf("initiate QMI network registration: %w", err)
-				}
-				registerIssued = true
-			}
-		} else if serving.RegistrationState == qmi.RegStateDenied {
-			return errors.New("QMI network registration was denied")
-		} else if !registerIssued {
-			if manualTarget {
-				var triggerErr error
-				forceSearchIssued, forceSearchUnsupported, triggerErr = triggerNativeQMIManualRegistration(
-					ctx, session, &request, serving,
-				)
-				if triggerErr != nil {
-					return triggerErr
-				}
-			} else if err := session.InitiateNetworkRegister(ctx, request); err != nil {
-				if !(setAutomatic && isUnsupportedQMIRegistrationCommand(err, qmi.NASInitiateNetworkRegister)) {
-					return fmt.Errorf("initiate QMI network registration: %w", err)
-				}
-			}
-			registerIssued = true
-		}
-
-		searching := serving.RegistrationState == qmi.RegStateSearching
-		if target != nil && qmiRegistrationStateRegistered(serving.RegistrationState) && !qmiServingSystemMatchesTarget(serving, *target) {
-			searching = true
-		}
-		if searching && registerIssued && !forceSearchIssued && !forceSearchUnsupported && attempt >= 2 {
-			forceSearchIssued = true
-			if err := session.ForceNetworkSearch(ctx); err != nil {
-				if isUnsupportedQMIForceSearch(err) {
-					forceSearchUnsupported = true
-				} else {
-					return fmt.Errorf("force QMI network search: %w", err)
-				}
-			}
-		}
-		radioCycleAfter := nativeQMIRegistrationRadioCycleThreshold(forceSearchUnsupported)
-		if searching && registerIssued && !radioCycleIssued && attempt >= radioCycleAfter {
-			radioCycleIssued = true
-			if err := session.SetOperatingMode(ctx, qmi.ModeLowPower); err == nil {
-				_ = waitNativeQMIRegistration(ctx)
-				_ = session.SetOperatingMode(ctx, qmi.ModeOnline)
-				registerIssued = false
-			}
-		}
-		if err := waitNativeQMIRegistration(ctx); err != nil {
-			return err
-		}
-	}
-	return fmt.Errorf("QMI network registration/PS attach timed out after %d attempts", nativeQMIRegistrationMaxAttempts)
-}
-
-func qmiServingSystemMatchesTarget(serving *qmi.ServingSystem, target qmi.ManualNetworkSelection) bool {
-	return serving != nil && serving.MCC == target.MCC && serving.MNC == target.MNC
-}
-
-func waitNativeQMIRegistration(ctx context.Context) error {
-	timer := time.NewTimer(nativeQMIRegistrationPollInterval)
-	defer timer.Stop()
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	case <-timer.C:
-		return nil
-	}
-}
-
-func (manager *Manager) nativeQMIOperatorSelectionLocked(
-	ctx context.Context,
-	candidate modem.Candidate,
-) (OperatorSelection, error) {
-	session, err := manager.openNativeQMIRegistration(ctx, candidate)
-	if err != nil {
-		return OperatorSelection{}, fmt.Errorf("open QMI NAS operator selection: %w", err)
-	}
-	defer session.Close()
-	pref, err := session.GetSystemSelectionPreference(ctx)
-	if err != nil {
-		return OperatorSelection{}, fmt.Errorf("read QMI system selection preference: %w", err)
-	}
-	return qmiOperatorSelectionFromPreference(pref)
-}
-
-func (manager *Manager) setNativeQMIOperatorSelectionLocked(
-	ctx context.Context,
-	candidate modem.Candidate,
-	automatic bool,
-	plmn string,
-	accessTechnologyValue *int,
-) (OperatorSelection, error) {
-	session, err := manager.openNativeQMIRegistration(ctx, candidate)
-	if err != nil {
-		return OperatorSelection{}, fmt.Errorf("open QMI NAS operator selection: %w", err)
-	}
-	defer session.Close()
-
-	if automatic {
-		request := qmiRegistrationRequestAutomatic()
-		if err := ensureNativeQMIRegistration(ctx, session, request, true); err != nil {
-			return OperatorSelection{}, err
-		}
-		pref, err := session.GetSystemSelectionPreference(ctx)
-		if err != nil {
-			return OperatorSelection{}, fmt.Errorf("read QMI system selection preference: %w", err)
-		}
-		return qmiOperatorSelectionFromPreference(pref)
-	}
-	request, err := qmiManualRegisterRequest(plmn, accessTechnologyValue)
-	if err != nil {
-		return OperatorSelection{}, err
-	}
-	preference, target, err := qmiManualSelectionPreferenceWithRAT(plmn, accessTechnologyValue)
-	if err != nil {
-		return OperatorSelection{}, err
-	}
-	// InitiateNetworkRegister is only a one-shot trigger on this firmware. The
-	// manual preference must be written separately or the next reconcile will
-	// read automatic selection and undo the requested lock.
-	if err := session.SetSystemSelectionPreference(ctx, preference); err != nil {
-		return OperatorSelection{}, fmt.Errorf("set manual QMI network selection: %w", err)
-	}
-	if err := ensureNativeQMIRegistrationForTarget(ctx, session, request, false, &target); err != nil {
-		manager.restoreNativeQMISelectionAfterFailure(session, candidate.ID)
-		return OperatorSelection{}, err
-	}
-	actual, err := session.GetSystemSelectionPreference(ctx)
-	if err != nil {
-		manager.restoreNativeQMISelectionAfterFailure(session, candidate.ID)
-		return OperatorSelection{}, fmt.Errorf("verify manual QMI network selection: %w", err)
-	}
-	if actual == nil || !actual.HasManualNetworkSelection || actual.ManualNetworkSelection != target {
-		manager.restoreNativeQMISelectionAfterFailure(session, candidate.ID)
-		return OperatorSelection{}, fmt.Errorf("modem did not retain manual PLMN %s", strings.TrimSpace(plmn))
-	}
-	return qmiOperatorSelectionFromPreference(actual)
-}
-
-// restoreNativeQMISelectionAfterFailure prevents a failed manual lock from
-// leaving the modem in a searching/manual state.  The caller may already have
-// exhausted its request deadline, so rollback uses a fresh bounded context and
-// schedules the normal background reconcile as a second line of defence.
-func (manager *Manager) restoreNativeQMISelectionAfterFailure(
-	session nativeQMIRegistrationSession,
-	deviceID string,
-) {
-	if manager == nil || session == nil {
-		return
-	}
-	rollbackCtx, cancel := context.WithTimeout(context.Background(), manager.longTimeout)
-	defer cancel()
-	_ = session.SetSystemSelectionPreference(rollbackCtx, qmiSelectionAutomaticPreference())
-	_ = session.InitiateNetworkRegister(rollbackCtx, qmiRegistrationRequestAutomatic())
-	_ = session.ForceNetworkSearch(rollbackCtx)
-	if strings.TrimSpace(deviceID) != "" {
-		manager.startNativeQMIRegistrationReconcile(deviceID)
-	}
-}
-
-func (manager *Manager) reRegisterNativeQMIOperatorLocked(
-	ctx context.Context,
-	candidate modem.Candidate,
-) (OperatorSelection, error) {
-	session, err := manager.openNativeQMIRegistration(ctx, candidate)
-	if err != nil {
-		return OperatorSelection{}, fmt.Errorf("open QMI NAS re-registration: %w", err)
-	}
-	defer session.Close()
-	pref, err := session.GetSystemSelectionPreference(ctx)
-	if err != nil {
-		return OperatorSelection{}, fmt.Errorf("read QMI system selection preference: %w", err)
-	}
-	request := qmiRegistrationRequestAutomatic()
-	setAutomatic := true
-	selection := OperatorSelection{Mode: 0}
-	if pref != nil && pref.HasManualNetworkSelection {
-		setAutomatic = false
-		request.Mode = qmi.NASNetworkRegisterManual
-		request.MCC = pref.ManualNetworkSelection.MCC
-		request.MNC = pref.ManualNetworkSelection.MNC
-		request.IncludesPCSDigit = pref.ManualNetworkSelection.IncludesPCSDigit
-		request.ChangeDuration = qmi.NASChangeDurationPermanent
-		request.HasChangeDuration = true
-		if pref.HasModePreference {
-			request.RadioAccessTech = qmiRATFromModePreference(pref.ModePreference)
-		}
-		selection, err = qmiOperatorSelectionFromPreference(pref)
-		if err != nil {
-			return OperatorSelection{}, err
-		}
-	}
-	var target *qmi.ManualNetworkSelection
-	if pref != nil && pref.HasManualNetworkSelection {
-		target = &pref.ManualNetworkSelection
-	}
-	if err := ensureNativeQMIRegistrationForTarget(ctx, session, request, setAutomatic, target); err != nil {
-		return OperatorSelection{}, err
-	}
-	return selection, nil
-}

internal/device/registration_native_qmi_test.go

@@ -1,271 +0,0 @@
-package device
-
-import (
-	"context"
-	"testing"
-
-	"github.com/iniwex5/quectel-qmi-go/pkg/qmi"
-
-	"vocat/internal/modem"
-)
-
-type fakeNativeQMIRegistrationSession struct {
-	mode             qmi.OperatingMode
-	serving          []*qmi.ServingSystem
-	selection        *qmi.SystemSelectionPreference
-	setModes         []qmi.OperatingMode
-	setPreferences   []qmi.SystemSelectionPreference
-	registerRequests []qmi.NASInitiateNetworkRegisterRequest
-	forceSearches    int
-	forceSearchErr   error
-	registerErr      error
-	attachRequests   []bool
-	closeCount       int
-}
-
-func (session *fakeNativeQMIRegistrationSession) GetOperatingMode(context.Context) (qmi.OperatingMode, error) {
-	return session.mode, nil
-}
-
-func (session *fakeNativeQMIRegistrationSession) SetOperatingMode(_ context.Context, mode qmi.OperatingMode) error {
-	session.mode = mode
-	session.setModes = append(session.setModes, mode)
-	return nil
-}
-
-func (session *fakeNativeQMIRegistrationSession) Close() error {
-	session.closeCount++
-	return nil
-}
-
-func (session *fakeNativeQMIRegistrationSession) GetServingSystem(context.Context) (*qmi.ServingSystem, error) {
-	if len(session.serving) == 0 {
-		return &qmi.ServingSystem{RegistrationState: qmi.RegStateSearching}, nil
-	}
-	current := session.serving[0]
-	if len(session.serving) > 1 {
-		session.serving = session.serving[1:]
-	}
-	return current, nil
-}
-
-func (session *fakeNativeQMIRegistrationSession) GetSystemSelectionPreference(context.Context) (*qmi.SystemSelectionPreference, error) {
-	if session.selection == nil {
-		return &qmi.SystemSelectionPreference{}, nil
-	}
-	return session.selection, nil
-}
-
-func (session *fakeNativeQMIRegistrationSession) SetSystemSelectionPreference(_ context.Context, pref qmi.SystemSelectionPreference) error {
-	session.selection = &pref
-	session.setPreferences = append(session.setPreferences, pref)
-	return nil
-}
-
-func (session *fakeNativeQMIRegistrationSession) InitiateNetworkRegister(_ context.Context, req qmi.NASInitiateNetworkRegisterRequest) error {
-	session.registerRequests = append(session.registerRequests, req)
-	return session.registerErr
-}
-
-func (session *fakeNativeQMIRegistrationSession) ForceNetworkSearch(context.Context) error {
-	session.forceSearches++
-	return session.forceSearchErr
-}
-
-func (session *fakeNativeQMIRegistrationSession) AttachDetach(_ context.Context, attached bool) error {
-	session.attachRequests = append(session.attachRequests, attached)
-	return nil
-}
-
-func TestEnsureNativeQMIRegistrationDrivesNASSequence(t *testing.T) {
-	session := &fakeNativeQMIRegistrationSession{
-		mode: qmi.ModeLowPower,
-		serving: []*qmi.ServingSystem{
-			{RegistrationState: qmi.RegStateSearching},
-			{RegistrationState: qmi.RegStateSearching},
-			{RegistrationState: qmi.RegStateRegistered, PSAttached: false},
-			{RegistrationState: qmi.RegStateRegistered, PSAttached: true},
-		},
-	}
-
-	if err := ensureNativeQMIRegistration(context.Background(), session, qmiRegistrationRequestAutomatic(), true); err != nil {
-		t.Fatalf("ensure native QMI registration: %v", err)
-	}
-	if len(session.setModes) != 1 || session.setModes[0] != qmi.ModeOnline {
-		t.Fatalf("operating mode writes = %#v, want [online]", session.setModes)
-	}
-	if len(session.setPreferences) != 1 || !session.setPreferences[0].HasNetworkSelectionPreference ||
-		session.setPreferences[0].NetworkSelectionPreference != qmi.NASNetworkSelectionAutomatic {
-		t.Fatalf("selection writes = %#v, want automatic", session.setPreferences)
-	}
-	if len(session.registerRequests) != 1 || session.registerRequests[0].Mode != qmi.NASNetworkRegisterAutomatic {
-		t.Fatalf("registration requests = %#v, want one automatic request", session.registerRequests)
-	}
-	if session.forceSearches != 1 {
-		t.Fatalf("force-search count = %d, want 1", session.forceSearches)
-	}
-	if len(session.attachRequests) != 1 || !session.attachRequests[0] {
-		t.Fatalf("attach requests = %#v, want one attach", session.attachRequests)
-	}
-}
-
-func TestQMIManualRegisterRequestMapsPLMNAndRAT(t *testing.T) {
-	rat := 7
-	request, err := qmiManualRegisterRequest("46001", &rat)
-	if err != nil {
-		t.Fatalf("manual request: %v", err)
-	}
-	if request.Mode != qmi.NASNetworkRegisterManual || request.MCC != 460 || request.MNC != 1 ||
-		request.IncludesPCSDigit || request.RadioAccessTech != 0x08 || !request.HasChangeDuration ||
-		request.ChangeDuration != qmi.NASChangeDurationPermanent {
-		t.Fatalf("manual request = %#v", request)
-	}
-}
-
-func TestQMIManualSelectionPreferenceMapsPLMN(t *testing.T) {
-	pref, selection, err := qmiManualSelectionPreference("46001")
-	if err != nil {
-		t.Fatalf("manual preference: %v", err)
-	}
-	if pref.NetworkSelectionPreference != qmi.NASNetworkSelectionManual ||
-		!pref.HasNetworkSelectionPreference || !pref.HasManualNetworkSelection ||
-		!pref.HasChangeDuration || pref.ChangeDuration != qmi.NASChangeDurationPermanent {
-		t.Fatalf("manual preference = %#v", pref)
-	}
-	if selection.MCC != 460 || selection.MNC != 1 || selection.IncludesPCSDigit {
-		t.Fatalf("manual selection = %#v", selection)
-	}
-}
-
-func TestQMIManualSelectionPreferenceMapsRAT(t *testing.T) {
-	rat := 7
-	pref, _, err := qmiManualSelectionPreferenceWithRAT("46001", &rat)
-	if err != nil {
-		t.Fatalf("manual preference: %v", err)
-	}
-	if !pref.HasModePreference || pref.ModePreference != qmi.NASRatModePreferenceLTE {
-		t.Fatalf("manual preference mode = %#v, want LTE mode preference", pref)
-	}
-}
-
-func TestQMIManualRegisterRequestRejectsUnknownRAT(t *testing.T) {
-	rat := 1
-	if _, err := qmiManualRegisterRequest("46001", &rat); err == nil {
-		t.Fatal("manual request with unknown RAT must fail")
-	}
-}
-
-func TestEnsureNativeQMIRegistrationWaitsForManualTarget(t *testing.T) {
-	session := &fakeNativeQMIRegistrationSession{
-		mode: qmi.ModeOnline,
-		serving: []*qmi.ServingSystem{
-			{RegistrationState: qmi.RegStateRegistered, PSAttached: true, MCC: 460, MNC: 0},
-			{RegistrationState: qmi.RegStateSearching},
-			{RegistrationState: qmi.RegStateRegistered, PSAttached: false, MCC: 460, MNC: 1},
-			{RegistrationState: qmi.RegStateRegistered, PSAttached: true, MCC: 460, MNC: 1},
-		},
-	}
-	request, err := qmiManualRegisterRequest("46001", nil)
-	if err != nil {
-		t.Fatalf("manual request: %v", err)
-	}
-	target := qmi.ManualNetworkSelection{MCC: 460, MNC: 1}
-	if err := ensureNativeQMIRegistrationForTarget(context.Background(), session, request, false, &target); err != nil {
-		t.Fatalf("ensure manual registration: %v", err)
-	}
-	if len(session.registerRequests) != 0 {
-		t.Fatalf("registration requests = %#v, want force-search-only manual trigger", session.registerRequests)
-	}
-	if session.forceSearches != 1 {
-		t.Fatalf("force-search count = %d, want 1", session.forceSearches)
-	}
-	if len(session.attachRequests) != 1 || !session.attachRequests[0] {
-		t.Fatalf("attach requests = %#v, want one attach", session.attachRequests)
-	}
-}
-
-func TestEnsureNativeQMIRegistrationFallsBackWhenForceSearchUnsupported(t *testing.T) {
-	session := &fakeNativeQMIRegistrationSession{
-		serving: []*qmi.ServingSystem{
-			{RegistrationState: qmi.RegStateRegistered, PSAttached: true, RadioInterface: 8, MCC: 460, MNC: 0},
-			{RegistrationState: qmi.RegStateSearching},
-			{RegistrationState: qmi.RegStateRegistered, PSAttached: false, MCC: 460, MNC: 1},
-			{RegistrationState: qmi.RegStateRegistered, PSAttached: true, MCC: 460, MNC: 1},
-		},
-		forceSearchErr: &qmi.QMIError{
-			Service: qmi.ServiceNAS, MessageID: qmi.NASForceNetworkSearch,
-			Result: 0x0001, ErrorCode: qmi.QMIErrNotSupported,
-		},
-	}
-	request, err := qmiManualRegisterRequest("46001", nil)
-	if err != nil {
-		t.Fatalf("manual request: %v", err)
-	}
-	target := qmi.ManualNetworkSelection{MCC: 460, MNC: 1}
-	if err := ensureNativeQMIRegistrationForTarget(context.Background(), session, request, false, &target); err != nil {
-		t.Fatalf("ensure manual registration: %v", err)
-	}
-	if len(session.registerRequests) != 1 || session.registerRequests[0].RadioAccessTech != 8 {
-		t.Fatalf("registration requests = %#v, want one LTE fallback request", session.registerRequests)
-	}
-	if session.forceSearches != 1 {
-		t.Fatalf("force-search count = %d, want one unsupported attempt", session.forceSearches)
-	}
-}
-
-func TestNativeQMIRegistrationCyclesEarlyWhenForceSearchUnsupported(t *testing.T) {
-	if got := nativeQMIRegistrationRadioCycleThreshold(true); got != 3 {
-		t.Fatalf("unsupported force-search threshold = %d, want 3", got)
-	}
-	if got := nativeQMIRegistrationRadioCycleThreshold(false); got != 30 {
-		t.Fatalf("supported force-search threshold = %d, want 30", got)
-	}
-}
-
-func TestIsNativeQMICandidateRequiresOpenStickWWANPair(t *testing.T) {
-	tests := []struct {
-		name      string
-		candidate modem.Candidate
-		want      bool
-	}{
-		{
-			name: "native",
-			candidate: modem.Candidate{
-				ID:         "wwan0",
-				QMIControl: "/dev/wwan0qmi0",
-			},
-			want: true,
-		},
-		{
-			name: "mhi native discovery id",
-			candidate: modem.Candidate{
-				ID:         "mhi-wwan0",
-				QMIControl: "/dev/wwan0qmi0",
-			},
-			want: true,
-		},
-		{
-			name: "different control device",
-			candidate: modem.Candidate{
-				ID:         "wwan0",
-				QMIControl: "/dev/cdc-wdm0",
-			},
-			want: false,
-		},
-		{
-			name: "non native id",
-			candidate: modem.Candidate{
-				ID:         "usb0",
-				QMIControl: "/dev/usb0qmi0",
-			},
-			want: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := isNativeQMICandidate(tt.candidate); got != tt.want {
-				t.Fatalf("isNativeQMICandidate() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

internal/device/scan_test.go

@@ -55,25 +55,6 @@ func TestCarrierForPLMNReturnsCountryCode(t *testing.T) {
 	}
 }
 
-func TestCountryForMCCUsesEmbeddedCountryIndex(t *testing.T) {
-	tests := map[string]string{
-		"234": "GB",
-		"262": "DE",
-		"310": "US",
-		"460": "CN",
-	}
-	for mcc, want := range tests {
-		if got, ok := CountryForMCC(mcc); !ok || got != want {
-			t.Errorf("CountryForMCC(%q) = (%q, %v), want %q", mcc, got, ok, want)
-		}
-	}
-	for _, invalid := range []string{"", "23", "999", "abcd"} {
-		if got, ok := CountryForMCC(invalid); ok || got != "" {
-			t.Errorf("CountryForMCC(%q) = (%q, %v), want unknown", invalid, got, ok)
-		}
-	}
-}
-
 func TestCarrierForIMSIHandlesTwoAndThreeDigitMNCs(t *testing.T) {
 	tests := []struct {
 		imsi        string
@@ -83,7 +64,6 @@ func TestCarrierForIMSIHandlesTwoAndThreeDigitMNCs(t *testing.T) {
 		{imsi: "234336570710174", wantPLMN: "23433", wantCountry: "GB"},
 		{imsi: "234159609054263", wantPLMN: "23415", wantCountry: "GB"},
 		{imsi: "234870123456789", wantPLMN: "23487", wantCountry: "GB"},
-		{imsi: "454006395879502", wantPLMN: "45400", wantCountry: "HK"},
 		{imsi: "310260123456789", wantPLMN: "310260", wantCountry: "US"},
 	}
 	for _, item := range tests {
@@ -93,20 +73,3 @@ func TestCarrierForIMSIHandlesTwoAndThreeDigitMNCs(t *testing.T) {
 		}
 	}
 }
-
-func TestCarrierForSIMUsesAndroidGIDRuleBeforePLMNFallback(t *testing.T) {
-	plmn, name, country, ok := CarrierForSIM(CarrierIdentity{
-		IMSI: "454006395879502", ICCID: "89852350126077295027",
-		SPN: "Saily", GID1: "536E617065", GID2: "536E617065000012", MNCLength: 2,
-	})
-	if !ok || plmn != "45400" || name != "Webbing" || country != "HK" {
-		t.Fatalf("CarrierForSIM exact rule = (%q, %q, %q, %v)", plmn, name, country, ok)
-	}
-
-	plmn, name, country, ok = CarrierForSIM(CarrierIdentity{
-		IMSI: "454006395879502", SPN: "Saily", MNCLength: 2,
-	})
-	if !ok || plmn != "45400" || name != "1O1O / csl / Club Sim" || country != "HK" {
-		t.Fatalf("CarrierForSIM generic fallback = (%q, %q, %q, %v)", plmn, name, country, ok)
-	}
-}

internal/device/snapshot.go

@@ -21,7 +21,6 @@ func (manager *Manager) readSnapshot(
 	candidate modem.Candidate,
 	backend string,
 	previousICCID string,
-	previousSnapshot *Snapshot,
 	client modem.Client,
 ) (Snapshot, error) {
 	snapshot := Snapshot{
@@ -39,19 +38,6 @@ func (manager *Manager) readSnapshot(
 	if snapshot.Model == "" && !strings.EqualFold(candidate.Product, "Android") {
 		snapshot.Model = candidate.Product
 	}
-	// Native MHI/QMI devices expose their immutable modem identity through DMS.
-	// Read it before any SIM-dependent AT probes: a missing/bad card can make
-	// those commands slow or fail, but must never prevent IMEI from appearing.
-	if strings.EqualFold(strings.TrimSpace(backend), "qmi") && isNativeQMICandidate(candidate) {
-		qmiContext, cancelQMI := manager.withTimeout(ctx, manager.commandTimeout*5)
-		qmiIMEI, qmiErr := manager.readNativeQMIIMEI(qmiContext, candidate)
-		cancelQMI()
-		if qmiErr == nil {
-			snapshot.IMEI = qmiIMEI
-		} else {
-			snapshot.Warnings = append(snapshot.Warnings, "read IMEI via QMI DMS: "+qmiErr.Error())
-		}
-	}
 
 	optional := func(command string) (modem.Response, bool) {
 		response, commandErr := manager.command(ctx, client, command)
@@ -69,23 +55,10 @@ func (manager *Manager) readSnapshot(
 	if ccidErr != nil {
 		ccid, ccidErr = manager.command(ctx, client, "AT+QCCID")
 	}
-	if ccidErr != nil && strings.EqualFold(strings.TrimSpace(backend), "qmi") && isNativeQMICandidate(candidate) {
-		qmiContext, cancelQMI := manager.withTimeout(ctx, manager.commandTimeout*5)
-		qmiICCID, qmiErr := manager.readNativeQMIICCID(qmiContext, candidate)
-		cancelQMI()
-		if qmiErr == nil {
-			snapshot.ICCID = qmiICCID
-			ccidErr = nil
-		} else {
-			snapshot.Warnings = append(snapshot.Warnings, "read ICCID via QMI UIM: "+qmiErr.Error())
-		}
-	}
 	if ccidErr != nil {
 		snapshot.Warnings = append(snapshot.Warnings, "read ICCID: "+ccidErr.Error())
 	} else {
-		if snapshot.ICCID == "" {
-			snapshot.ICCID = parseICCIDIdentifier(ccid, []string{"+CCID:", "+QCCID:"}, 18, 22)
-		}
+		snapshot.ICCID = parseICCIDIdentifier(ccid, []string{"+CCID:", "+QCCID:"}, 18, 22)
 	}
 	previousICCID = strings.TrimSpace(previousICCID)
 	if previousICCID != "" && snapshot.ICCID != "" && !strings.EqualFold(previousICCID, snapshot.ICCID) {
@@ -108,25 +81,6 @@ func (manager *Manager) readSnapshot(
 	if response, spnErr := manager.command(ctx, client, "AT+CRSM=176,28486,0,0,17"); spnErr == nil {
 		snapshot.SPN = parseSPN(response)
 	}
-	if previousSnapshot != nil && previousSnapshot.IdentityFilesRead &&
-		strings.EqualFold(strings.TrimSpace(previousSnapshot.ICCID), strings.TrimSpace(snapshot.ICCID)) {
-		snapshot.MNCLength = previousSnapshot.MNCLength
-		snapshot.GID1 = previousSnapshot.GID1
-		snapshot.GID2 = previousSnapshot.GID2
-		snapshot.IdentityFilesRead = true
-	} else {
-		// Android's carrier resolver does not identify MVNOs from MCC/MNC alone.
-		// Read these files once per inserted ICCID and cache even an empty result;
-		// repeatedly probing unsupported EFs would add avoidable modem traffic.
-		if efAD := manager.readTransparentSIMFile(ctx, client, 28589); len(efAD) >= 4 {
-			if length := int(efAD[3] & 0x0f); length == 2 || length == 3 {
-				snapshot.MNCLength = length
-			}
-		}
-		snapshot.GID1 = encodeSIMGroupID(manager.readTransparentSIMFile(ctx, client, 28478))
-		snapshot.GID2 = encodeSIMGroupID(manager.readTransparentSIMFile(ctx, client, 28479))
-		snapshot.IdentityFilesRead = true
-	}
 	if response, ok := optional("AT+CSQ"); ok {
 		snapshot.SignalRaw, snapshot.SignalPercent, snapshot.RSSIDBm = parseCSQ(response)
 	}
@@ -185,31 +139,13 @@ func (manager *Manager) readSnapshot(
 		snapshot.RegistrationStatus = 1
 		snapshot.RegistrationSource = "COPS"
 	}
-	if snapshot.IMEI == "" {
-		response, ok := optional("AT+CGSN")
-		if ok {
-			snapshot.IMEI = parseIdentifier(
-				response,
-				[]string{"+CGSN:", "+GSN:"},
-				14,
-				17,
-			)
-		}
-	}
-	if snapshot.IMEI == "" && strings.EqualFold(strings.TrimSpace(backend), "qmi") && isNativeQMICandidate(candidate) {
-		qmiContext, cancelQMI := manager.withTimeout(ctx, manager.commandTimeout*5)
-		qmiIMEI, qmiErr := manager.readNativeQMIIMEI(qmiContext, candidate)
-		cancelQMI()
-		if qmiErr == nil {
-			snapshot.IMEI = qmiIMEI
-		} else {
-			snapshot.Warnings = append(snapshot.Warnings, "read IMEI via QMI DMS: "+qmiErr.Error())
-		}
-	}
-	if snapshot.IMEI == "" && previousSnapshot != nil {
-		// IMEI is hardware identity and does not change with the inserted card.
-		// Preserve a prior successful read across a transient QMI/AT failure.
-		snapshot.IMEI = previousSnapshot.IMEI
+	if response, ok := optional("AT+CGSN"); ok {
+		snapshot.IMEI = parseIdentifier(
+			response,
+			[]string{"+CGSN:", "+GSN:"},
+			14,
+			17,
+		)
 	}
 
 	if response, ok := optional("AT+CFUN?"); ok {
@@ -228,91 +164,6 @@ func (manager *Manager) readSnapshot(
 	return snapshot, nil
 }
 
-func (manager *Manager) readTransparentSIMFile(ctx context.Context, client modem.Client, fileID int) []byte {
-	response, err := manager.command(ctx, client, fmt.Sprintf("AT+CRSM=192,%d,0,0,0", fileID))
-	if err != nil {
-		return nil
-	}
-	size := transparentSIMFileSize(crsmPayload(response))
-	if size <= 0 || size > 64 {
-		return nil
-	}
-	response, err = manager.command(ctx, client, fmt.Sprintf("AT+CRSM=176,%d,0,0,%d", fileID, size))
-	if err != nil {
-		return nil
-	}
-	return crsmPayload(response)
-}
-
-func transparentSIMFileSize(payload []byte) int {
-	// USIM FCP templates contain file size in tag 0x80. Skip the outer 0x62
-	// template and walk its immediate TLVs.
-	content := payload
-	if len(content) >= 2 && content[0] == 0x62 {
-		length, header, ok := berLength(content[1:])
-		if !ok || 1+header+length > len(content) {
-			return 0
-		}
-		content = content[1+header : 1+header+length]
-	}
-	for offset := 0; offset+2 <= len(content); {
-		tag := content[offset]
-		length, header, ok := berLength(content[offset+1:])
-		start := offset + 1 + header
-		end := start + length
-		if !ok || end > len(content) {
-			break
-		}
-		if tag == 0x80 && (length == 1 || length == 2) {
-			size := 0
-			for _, value := range content[start:end] {
-				size = size<<8 | int(value)
-			}
-			return size
-		}
-		offset = end
-	}
-	// Legacy GSM GET RESPONSE data stores file size in bytes 2 and 3.
-	if len(payload) >= 4 && payload[0] != 0x62 {
-		return int(payload[2])<<8 | int(payload[3])
-	}
-	return 0
-}
-
-func berLength(value []byte) (length, header int, ok bool) {
-	if len(value) == 0 {
-		return 0, 0, false
-	}
-	if value[0] < 0x80 {
-		return int(value[0]), 1, true
-	}
-	count := int(value[0] & 0x7f)
-	if count == 0 || count > 2 || len(value) < count+1 {
-		return 0, 0, false
-	}
-	for _, item := range value[1 : count+1] {
-		length = length<<8 | int(item)
-	}
-	return length, count + 1, true
-}
-
-func encodeSIMGroupID(value []byte) string {
-	if len(value) == 0 {
-		return ""
-	}
-	allPadding := true
-	for _, item := range value {
-		if item != 0xff {
-			allPadding = false
-			break
-		}
-	}
-	if allPadding {
-		return ""
-	}
-	return strings.ToUpper(hex.EncodeToString(value))
-}
-
 func parseSPN(response modem.Response) string {
 	value := valueAfterPrefix(response, "+CRSM:")
 	fields := csvValues(value)

internal/device/types.go

@@ -105,10 +105,6 @@ type Snapshot struct {
 	ICCID              string      `json:"iccid"`
 	IMSI               string      `json:"imsi"`
 	SPN                string      `json:"spn,omitempty"`
-	MNCLength          int         `json:"mncLength,omitempty"`
-	GID1               string      `json:"gid1,omitempty"`
-	GID2               string      `json:"gid2,omitempty"`
-	IdentityFilesRead  bool        `json:"-"`
 	OperatingMode      int         `json:"operatingMode"`
 	ModeKnown          bool        `json:"modeKnown"`
 	FlightMode         bool        `json:"flightMode"`

internal/device/vowifi_qmi.go

@@ -1,194 +0,0 @@
-package device
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"strings"
-	"time"
-)
-
-func (manager *Manager) withNativeQMIVoWiFiSession(ctx context.Context, id string, fn func(nativeQMIVoWiFiSession) error) error {
-	control, native, err := manager.nativeQMIControl(id)
-	if err != nil {
-		return err
-	}
-	if !native {
-		return errors.New("native QMI control is unavailable")
-	}
-	session, err := manager.qmiRadioOpener(ctx, control)
-	if err != nil {
-		return fmt.Errorf("open native QMI control: %w", err)
-	}
-	defer session.Close()
-	qmiSession, ok := session.(nativeQMIVoWiFiSession)
-	if !ok {
-		return errors.New("native QMI session lacks UIM/NAS support")
-	}
-	return fn(qmiSession)
-}
-
-// ReadNativeQMIIdentity supplies the live subscription identity without using
-// an AT port. The primitive return values intentionally keep device independent
-// from the VoWiFi package while satisfying its narrow controller interface.
-func (manager *Manager) ReadNativeQMIIdentity(ctx context.Context, id string) (iccid, imsi, imei, mcc, mnc string, err error) {
-	err = manager.withNativeQMIVoWiFiSession(ctx, id, func(session nativeQMIVoWiFiSession) error {
-		if iccid, err = session.GetICCID(ctx); err != nil {
-			return fmt.Errorf("read QMI ICCID: %w", err)
-		}
-		if imsi, err = session.GetIMSI(ctx); err != nil {
-			return fmt.Errorf("read QMI IMSI: %w", err)
-		}
-		if imei, err = session.GetIMEI(ctx); err != nil {
-			return fmt.Errorf("read QMI IMEI: %w", err)
-		}
-		if mcc, mnc, err = session.GetNativeMCCMNC(ctx); err != nil {
-			return fmt.Errorf("read QMI home PLMN: %w", err)
-		}
-		return nil
-	})
-	return
-}
-
-func (manager *Manager) ProbeNativeQMIApplication(ctx context.Context, id, preference string) (aid []byte, application string, err error) {
-	err = manager.withNativeQMIVoWiFiSession(ctx, id, func(session nativeQMIVoWiFiSession) error {
-		if strings.EqualFold(strings.TrimSpace(preference), "isim_strict") {
-			aid, err = session.GetISIMAID(ctx)
-			application = "ISIM"
-			return err
-		}
-		if aid, err = session.GetUSIMAID(ctx); err == nil {
-			application = "USIM"
-			return nil
-		}
-		aid, err = session.GetISIMAID(ctx)
-		application = "ISIM"
-		return err
-	})
-	return
-}
-
-func (manager *Manager) AuthenticateNativeQMI(ctx context.Context, id string, aid, apdu []byte) (response []byte, err error) {
-	err = manager.withNativeQMIVoWiFiSession(ctx, id, func(session nativeQMIVoWiFiSession) error {
-		channel, openErr := session.OpenLogicalChannel(ctx, 1, aid)
-		if openErr != nil {
-			return fmt.Errorf("open QMI UIM logical channel: %w", openErr)
-		}
-		command := append([]byte(nil), apdu...)
-		response, err = session.SendAPDU(ctx, 1, channel, command)
-		// ISO/IEC 7816-4 procedure bytes are transport-level continuation,
-		// not an AKA rejection. QMI exposes the raw status words, so follow
-		// 61xx/9Fxx with GET RESPONSE and retry 6Cxx with the advised Le while
-		// the same logical channel is still open.
-		for step := 0; err == nil && step < 4 && len(response) >= 2; step++ {
-			sw1, sw2 := response[len(response)-2], response[len(response)-1]
-			switch sw1 {
-			case 0x61, 0x9f:
-				response, err = session.SendAPDU(ctx, 1, channel, []byte{0x00, 0xc0, 0x00, 0x00, sw2})
-			case 0x6c:
-				if len(command) < 5 {
-					step = 4
-					continue
-				}
-				command[len(command)-1] = sw2
-				response, err = session.SendAPDU(ctx, 1, channel, command)
-			default:
-				step = 4
-			}
-		}
-		closeErr := session.CloseLogicalChannel(ctx, 1, channel)
-		return errors.Join(err, closeErr)
-	})
-	return
-}
-
-func (manager *Manager) NativeQMIRadioSnapshot(ctx context.Context, id string) (mode int, psAttached bool, err error) {
-	err = manager.withNativeQMIVoWiFiSession(ctx, id, func(session nativeQMIVoWiFiSession) error {
-		qmiMode, modeErr := session.GetOperatingMode(ctx)
-		if modeErr != nil {
-			return modeErr
-		}
-		mode = qmiModeAsCFUN(qmiMode)
-		serving, servingErr := session.GetServingSystem(ctx)
-		if servingErr == nil && serving != nil {
-			psAttached = serving.PSAttached
-		}
-		// An RF-off modem commonly rejects NAS serving-system queries; DMS mode
-		// remains sufficient evidence and data cannot be attached while RF is off.
-		if servingErr != nil && !isQMIRadioOffMode(qmiMode) {
-			return servingErr
-		}
-		return nil
-	})
-	return
-}
-
-func (manager *Manager) StopNativeQMICellularData(ctx context.Context, id string) error {
-	return manager.withNativeQMIVoWiFiSession(ctx, id, func(session nativeQMIVoWiFiSession) error {
-		serving, err := session.GetServingSystem(ctx)
-		if err != nil {
-			return nil
-		}
-		if serving == nil || !serving.PSAttached {
-			return nil
-		}
-		if err := session.AttachDetach(ctx, false); err != nil {
-			return err
-		}
-		deadline := time.NewTicker(250 * time.Millisecond)
-		defer deadline.Stop()
-		for attempt := 0; attempt < 12; attempt++ {
-			current, readErr := session.GetServingSystem(ctx)
-			if readErr == nil && (current == nil || !current.PSAttached) {
-				return nil
-			}
-			select {
-			case <-ctx.Done():
-				return ctx.Err()
-			case <-deadline.C:
-			}
-		}
-		return errors.New("native QMI packet service remained attached")
-	})
-}
-
-func (manager *Manager) SetNativeQMIRadioOff(ctx context.Context, id string, off bool) error {
-	_, err := manager.SetFlight(ctx, id, off)
-	return err
-}
-
-func (manager *Manager) powerCycleNativeQMISIM(ctx context.Context, id string) (bool, error) {
-	control, native, err := manager.nativeQMIControl(id)
-	if err != nil || !native {
-		return native, err
-	}
-	session, err := manager.qmiRadioOpener(ctx, control)
-	if err != nil {
-		return true, err
-	}
-	defer session.Close()
-	uim, ok := session.(nativeQMIVoWiFiSession)
-	if !ok {
-		return true, errors.New("native QMI session lacks SIM power control")
-	}
-	if resetter, ok := session.(nativeQMIUIMResetSession); ok {
-		_ = resetter.ResetUIM(ctx)
-	}
-	if err := uim.PowerOffSIM(ctx, 1); err != nil {
-		return true, err
-	}
-	select {
-	case <-ctx.Done():
-		return true, ctx.Err()
-	case <-time.After(3 * time.Second):
-	}
-	if err := uim.PowerOnSIM(ctx, 1); err != nil {
-		return true, err
-	}
-	select {
-	case <-ctx.Done():
-		return true, ctx.Err()
-	case <-time.After(time.Second):
-	}
-	return true, nil
-}

internal/modem/serial.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"path/filepath"
 
 	"go.bug.st/serial"
 )
@@ -22,22 +21,6 @@ func (opener SerialOpener) Open(ctx context.Context, port Port) (Client, error)
 	if path == "" {
 		return nil, errors.New("modem: candidate has no AT port")
 	}
-	if isNativeWWANATPath(path) {
-		rawPort, err := openNativeWWANATTransport(path)
-		if err != nil {
-			return nil, fmt.Errorf("open WWAN AT port %s: %w", path, err)
-		}
-		if err := rawPort.ResetInputBuffer(); err != nil {
-			_ = rawPort.Close()
-			return nil, fmt.Errorf("reset WWAN AT input buffer %s: %w", path, err)
-		}
-		session, err := NewSession(rawPort, opener.SessionOptions)
-		if err != nil {
-			_ = rawPort.Close()
-			return nil, err
-		}
-		return session, nil
-	}
 	baudRate := opener.BaudRate
 	if baudRate <= 0 {
 		baudRate = 115200
@@ -62,8 +45,3 @@ func (opener SerialOpener) Open(ctx context.Context, port Port) (Client, error)
 	}
 	return session, nil
 }
-
-func isNativeWWANATPath(path string) bool {
-	_, kind, _, ok := parseWWANPortName(filepath.Base(filepath.Clean(path)))
-	return ok && kind == "at"
-}

internal/modem/serial_test.go

@@ -1,24 +0,0 @@
-package modem
-
-import "testing"
-
-func TestIsNativeWWANATPath(t *testing.T) {
-	for _, path := range []string{
-		"/dev/wwan0at0",
-		"/dev/wwan12at3",
-	} {
-		if !isNativeWWANATPath(path) {
-			t.Errorf("isNativeWWANATPath(%q) = false", path)
-		}
-	}
-	for _, path := range []string{
-		"/dev/wwan0qmi0",
-		"/dev/ttyUSB2",
-		"/tmp/wwan-at",
-		"/dev/wwanat0",
-	} {
-		if isNativeWWANATPath(path) {
-			t.Errorf("isNativeWWANATPath(%q) = true", path)
-		}
-	}
-}

internal/modem/wwan_at_linux.go

@@ -1,161 +0,0 @@
-//go:build linux
-
-package modem
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"sync"
-	"time"
-
-	"golang.org/x/sys/unix"
-)
-
-// nativeWWANATTransport adapts a Linux WWAN AT character device to Session's
-// serial-like transport contract. WWAN ports are not TTYs, so termios ioctls
-// used by ordinary serial libraries fail even though raw AT read/write works.
-type nativeWWANATTransport struct {
-	mu          sync.RWMutex
-	fd          int
-	readTimeout time.Duration
-	closed      bool
-}
-
-func openNativeWWANATTransport(path string) (Transport, error) {
-	fd, err := unix.Open(path, unix.O_RDWR|unix.O_NONBLOCK|unix.O_NOCTTY|unix.O_CLOEXEC, 0)
-	if err != nil {
-		return nil, err
-	}
-	return &nativeWWANATTransport{fd: fd, readTimeout: -1}, nil
-}
-
-func (transport *nativeWWANATTransport) Read(buffer []byte) (int, error) {
-	transport.mu.RLock()
-	defer transport.mu.RUnlock()
-	if transport.closed {
-		return 0, io.ErrClosedPipe
-	}
-
-	deadline := time.Time{}
-	if transport.readTimeout >= 0 {
-		deadline = time.Now().Add(transport.readTimeout)
-	}
-	for {
-		timeout := -1
-		if !deadline.IsZero() {
-			remaining := time.Until(deadline)
-			if remaining <= 0 {
-				return 0, nil
-			}
-			timeout = int((remaining + time.Millisecond - 1) / time.Millisecond)
-		}
-		fds := []unix.PollFd{{Fd: int32(transport.fd), Events: unix.POLLIN}}
-		ready, err := unix.Poll(fds, timeout)
-		if errors.Is(err, unix.EINTR) {
-			continue
-		}
-		if err != nil {
-			return 0, err
-		}
-		if ready == 0 {
-			return 0, nil
-		}
-		if fds[0].Revents&(unix.POLLERR|unix.POLLHUP|unix.POLLNVAL) != 0 &&
-			fds[0].Revents&unix.POLLIN == 0 {
-			return 0, io.EOF
-		}
-		count, err := unix.Read(transport.fd, buffer)
-		if errors.Is(err, unix.EINTR) || errors.Is(err, unix.EAGAIN) {
-			continue
-		}
-		if count < 0 {
-			count = 0
-		}
-		return count, err
-	}
-}
-
-func (transport *nativeWWANATTransport) Write(buffer []byte) (int, error) {
-	transport.mu.RLock()
-	defer transport.mu.RUnlock()
-	if transport.closed {
-		return 0, io.ErrClosedPipe
-	}
-	for {
-		count, err := unix.Write(transport.fd, buffer)
-		if errors.Is(err, unix.EINTR) {
-			continue
-		}
-		if errors.Is(err, unix.EAGAIN) {
-			fds := []unix.PollFd{{Fd: int32(transport.fd), Events: unix.POLLOUT}}
-			if _, pollErr := unix.Poll(fds, 1000); pollErr != nil {
-				return 0, pollErr
-			}
-			continue
-		}
-		if count < 0 {
-			count = 0
-		}
-		return count, err
-	}
-}
-
-func (transport *nativeWWANATTransport) Drain() error {
-	transport.mu.RLock()
-	defer transport.mu.RUnlock()
-	if transport.closed {
-		return io.ErrClosedPipe
-	}
-	// WWAN character-device writes are handed to the modem synchronously and
-	// have no termios output queue to drain.
-	return nil
-}
-
-func (transport *nativeWWANATTransport) ResetInputBuffer() error {
-	transport.mu.RLock()
-	defer transport.mu.RUnlock()
-	if transport.closed {
-		return io.ErrClosedPipe
-	}
-	buffer := make([]byte, 4096)
-	for {
-		fds := []unix.PollFd{{Fd: int32(transport.fd), Events: unix.POLLIN}}
-		ready, err := unix.Poll(fds, 0)
-		if err != nil {
-			return err
-		}
-		if ready == 0 || fds[0].Revents&unix.POLLIN == 0 {
-			return nil
-		}
-		if _, err := unix.Read(transport.fd, buffer); err != nil {
-			if errors.Is(err, unix.EINTR) || errors.Is(err, unix.EAGAIN) {
-				continue
-			}
-			return err
-		}
-	}
-}
-
-func (transport *nativeWWANATTransport) SetReadTimeout(timeout time.Duration) error {
-	if timeout < -1 {
-		return fmt.Errorf("invalid read timeout %s", timeout)
-	}
-	transport.mu.Lock()
-	defer transport.mu.Unlock()
-	if transport.closed {
-		return io.ErrClosedPipe
-	}
-	transport.readTimeout = timeout
-	return nil
-}
-
-func (transport *nativeWWANATTransport) Close() error {
-	transport.mu.Lock()
-	defer transport.mu.Unlock()
-	if transport.closed {
-		return nil
-	}
-	transport.closed = true
-	return unix.Close(transport.fd)
-}

internal/modem/wwan_at_other.go

@@ -1,9 +0,0 @@
-//go:build !linux
-
-package modem
-
-import "fmt"
-
-func openNativeWWANATTransport(path string) (Transport, error) {
-	return nil, fmt.Errorf("native WWAN AT ports are unsupported on this platform: %s", path)
-}

internal/qmiport/lease.go

@@ -1,145 +0,0 @@
-// Package qmiport coordinates access to native Linux WWAN QMI control ports.
-package qmiport
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-	"sync"
-	"syscall"
-)
-
-type portHandle interface {
-	Close() error
-	Stat() (os.FileInfo, error)
-}
-
-type portOpener func(string) (portHandle, error)
-
-type entry struct {
-	gate chan struct{}
-
-	keeperMu sync.Mutex
-	keeper   portHandle
-}
-
-type coordinator struct {
-	mu      sync.Mutex
-	entries map[string]*entry
-	opener  portOpener
-}
-
-// Lease serializes one QMI transaction sequence for a control port. Release
-// does not close the keepalive descriptor: the old OpenStick 410 WWAN driver
-// removes DATA5_CNTL when the final descriptor closes, and does not reliably
-// recreate it until the modem is reset.
-type Lease struct {
-	entry *entry
-	once  sync.Once
-}
-
-var processCoordinator = newCoordinator(openPort)
-
-func newCoordinator(opener portOpener) *coordinator {
-	return &coordinator{
-		entries: make(map[string]*entry),
-		opener:  opener,
-	}
-}
-
-func openPort(path string) (portHandle, error) {
-	return os.OpenFile(path, os.O_RDWR|syscall.O_NONBLOCK|syscall.O_NOCTTY, 0)
-}
-
-// Acquire keeps path open for the process lifetime and grants exclusive QMI
-// access until the returned lease is released. A modem reset replaces the
-// device node; ensureKeeper detects that inode change and rearms the keepalive.
-func Acquire(ctx context.Context, path string) (*Lease, error) {
-	return processCoordinator.acquire(ctx, path)
-}
-
-func (coordinator *coordinator) acquire(ctx context.Context, path string) (*Lease, error) {
-	if ctx == nil {
-		ctx = context.Background()
-	}
-	path = filepath.Clean(path)
-	if path == "." || path == "" {
-		return nil, errors.New("QMI control path is required")
-	}
-	coordinator.mu.Lock()
-	item := coordinator.entries[path]
-	if item == nil {
-		item = &entry{gate: make(chan struct{}, 1)}
-		item.gate <- struct{}{}
-		coordinator.entries[path] = item
-	}
-	coordinator.mu.Unlock()
-
-	select {
-	case <-ctx.Done():
-		return nil, ctx.Err()
-	case <-item.gate:
-	}
-	if err := coordinator.ensureKeeper(path, item); err != nil {
-		item.gate <- struct{}{}
-		return nil, fmt.Errorf("keep QMI control port %s open: %w", path, err)
-	}
-	return &Lease{entry: item}, nil
-}
-
-func (coordinator *coordinator) ensureKeeper(path string, item *entry) error {
-	item.keeperMu.Lock()
-	defer item.keeperMu.Unlock()
-
-	currentInfo, err := os.Stat(path)
-	if err != nil {
-		return err
-	}
-	if item.keeper != nil {
-		keeperInfo, statErr := item.keeper.Stat()
-		if statErr == nil && os.SameFile(currentInfo, keeperInfo) {
-			return nil
-		}
-		_ = item.keeper.Close()
-		item.keeper = nil
-	}
-	keeper, err := coordinator.opener(path)
-	if err != nil {
-		return err
-	}
-	item.keeper = keeper
-	return nil
-}
-
-// Release allows the next QMI-UIM operation to use this control port.
-func (lease *Lease) Release() {
-	if lease == nil || lease.entry == nil {
-		return
-	}
-	lease.once.Do(func() {
-		lease.entry.gate <- struct{}{}
-	})
-}
-
-func (coordinator *coordinator) close() error {
-	coordinator.mu.Lock()
-	entries := make([]*entry, 0, len(coordinator.entries))
-	for _, item := range coordinator.entries {
-		entries = append(entries, item)
-	}
-	coordinator.entries = make(map[string]*entry)
-	coordinator.mu.Unlock()
-
-	var errs []error
-	for _, item := range entries {
-		item.keeperMu.Lock()
-		if item.keeper != nil {
-			errs = append(errs, item.keeper.Close())
-			item.keeper = nil
-		}
-		item.keeperMu.Unlock()
-	}
-	return errors.Join(errs...)
-}

internal/qmiport/lease_test.go

@@ -1,77 +0,0 @@
-package qmiport
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"sync/atomic"
-	"testing"
-	"time"
-)
-
-func TestLeaseKeepsPortOpenAndSerializesUsers(t *testing.T) {
-	path := filepath.Join(t.TempDir(), "wwan0qmi0")
-	if err := os.WriteFile(path, nil, 0o600); err != nil {
-		t.Fatal(err)
-	}
-	var opens atomic.Int32
-	coordinator := newCoordinator(func(path string) (portHandle, error) {
-		opens.Add(1)
-		return os.OpenFile(path, os.O_RDWR, 0)
-	})
-	t.Cleanup(func() { _ = coordinator.close() })
-
-	first, err := coordinator.acquire(context.Background(), path)
-	if err != nil {
-		t.Fatalf("first acquire: %v", err)
-	}
-	ctx, cancel := context.WithTimeout(context.Background(), 20*time.Millisecond)
-	defer cancel()
-	if _, err := coordinator.acquire(ctx, path); err == nil {
-		t.Fatal("second acquire succeeded before the first lease was released")
-	}
-	first.Release()
-
-	second, err := coordinator.acquire(context.Background(), path)
-	if err != nil {
-		t.Fatalf("second acquire: %v", err)
-	}
-	second.Release()
-	if got := opens.Load(); got != 1 {
-		t.Fatalf("keepalive opens = %d, want 1", got)
-	}
-}
-
-func TestLeaseReopensReplacedDeviceNode(t *testing.T) {
-	directory := t.TempDir()
-	path := filepath.Join(directory, "wwan0qmi0")
-	if err := os.WriteFile(path, nil, 0o600); err != nil {
-		t.Fatal(err)
-	}
-	var opens atomic.Int32
-	coordinator := newCoordinator(func(path string) (portHandle, error) {
-		opens.Add(1)
-		return os.OpenFile(path, os.O_RDWR, 0)
-	})
-	t.Cleanup(func() { _ = coordinator.close() })
-
-	first, err := coordinator.acquire(context.Background(), path)
-	if err != nil {
-		t.Fatal(err)
-	}
-	first.Release()
-	if err := os.Remove(path); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(path, nil, 0o600); err != nil {
-		t.Fatal(err)
-	}
-	second, err := coordinator.acquire(context.Background(), path)
-	if err != nil {
-		t.Fatal(err)
-	}
-	second.Release()
-	if got := opens.Load(); got != 2 {
-		t.Fatalf("keepalive opens = %d, want 2 after node replacement", got)
-	}
-}

internal/server/automatic_task_notifications.go

@@ -31,7 +31,6 @@ type automaticTaskNotification struct {
 }
 
 func (s *Server) notifyAutomaticTask(ctx context.Context, task store.AutomaticTask, run store.AutomaticTaskRun) {
-	ctx = s.notificationDestinationContext(ctx)
 	deviceLabel := task.DeviceID
 	if configured, err := s.store.Device(ctx, task.DeviceID); err == nil {
 		deviceLabel = firstNonEmpty(configured.Name, configured.ID)

internal/server/device_api.go

@@ -239,14 +239,10 @@ func (s *Server) handleDevices(w http.ResponseWriter, r *http.Request) bool {
 			return true
 		}
 		config := payload.toStoreDevice()
-		isNative410 := config.DeviceType == store.DeviceTypeWiFi410
 		// Newly added hardware starts fail-closed: RF is disabled immediately and
-		// VoWiFi becomes the desired service on supported devices. Native 410
-		// uses its QMI UIM/DMS/NAS adapter; only cellular SMS remains unavailable.
+		// VoWiFi becomes the desired service. Cellular registration is only
+		// restored by the user's later airplane-mode-off action.
 		config.VoWiFiEnabled = true
-		if isNative410 {
-			config.SMSEnabled = false
-		}
 		config.NetworkEnabled = false
 		if !s.developerActive(r.Context()) {
 			config.NetworkEnabled = false
@@ -288,7 +284,7 @@ func (s *Server) handleDevices(w http.ResponseWriter, r *http.Request) bool {
 				}
 			}
 		}
-		if s.vowifi != nil && config.VoWiFiEnabled {
+		if s.vowifi != nil {
 			if _, err := s.vowifi.RequestEnabled(config.ID, true); err != nil {
 				s.logger.Warn("new device saved in safe airplane mode but VoWiFi start was not queued", "device_id", config.ID, "error", err)
 			}
@@ -348,14 +344,7 @@ func (s *Server) handleDiscoveredDevices(w http.ResponseWriter, r *http.Request)
 		writeJSON(w, http.StatusOK, map[string]any{"data": map[string]any{"devices": []any{}}})
 		return true
 	}
-	// This endpoint backs the add-device dialog. Always perform a new physical
-	// scan instead of serving Manager.List(), which intentionally retains
-	// unplugged configured devices so the main device list can show them offline.
-	devices, err := s.devices.Discover(r.Context())
-	if err != nil {
-		s.writeDeviceError(w, err)
-		return true
-	}
+	devices := s.devices.List()
 	configured, err := s.store.ListDevices(r.Context())
 	if err != nil {
 		s.writeStoreError(w, err)
@@ -363,9 +352,6 @@ func (s *Server) handleDiscoveredDevices(w http.ResponseWriter, r *http.Request)
 	}
 	result := make([]map[string]any, 0, len(devices))
 	for _, entry := range devices {
-		if !entry.Discovered {
-			continue
-		}
 		candidate := entry.Candidate
 		atPorts := make([]string, 0, len(candidate.Ports))
 		for _, port := range candidate.Ports {
@@ -516,10 +502,6 @@ func (s *Server) handleDevicePath(
 	}
 
 	entry, physicalID, physicalPresent := s.physicalForConfig(config)
-	if config.DeviceType == store.DeviceTypeWiFi410 && native410UnsupportedOperation(tail) {
-		writeError(w, http.StatusNotImplemented, "device_feature_unsupported", "this feature is not supported by the native OpenStick 410 backend")
-		return true
-	}
 	if config.DeviceType == store.DeviceTypeUSBSIMReader && len(tail) > 0 {
 		operation := strings.Join(tail, "/")
 		unsupported := tail[0] == "network" || tail[0] == "operator_selection" ||
@@ -671,14 +653,6 @@ func (s *Server) handleDevicePath(
 	return true
 }
 
-func native410UnsupportedOperation(tail []string) bool {
-	if len(tail) == 0 {
-		return false
-	}
-	operation := strings.Join(tail, "/")
-	return tail[0] == "calls" || operation == "actions/reboot"
-}
-
 func (s *Server) handleUSBNetMode(w http.ResponseWriter, r *http.Request, physicalID string) bool {
 	switch r.Method {
 	case http.MethodGet:
@@ -1421,9 +1395,9 @@ func (s *Server) writeDeviceError(w http.ResponseWriter, err error) {
 	case errors.Is(err, context.Canceled):
 		writeError(w, http.StatusRequestTimeout, "request_canceled", "the modem request was canceled")
 	default:
-		// Preserve the hardware failure reason in the operator-visible log while
-		// keeping AT payloads and long APDU material out of it.
-		s.logger.Warn("device operation failed", "error", device.HardwareErrorDetail(err))
+		// Device errors may echo an AT command. Authentication commands can
+		// contain APN credentials, so keep raw errors out of logs and responses.
+		s.logger.Warn("device operation failed")
 		writeError(w, http.StatusBadGateway, "modem_error", "the device operation failed")
 	}
 }
@@ -1498,13 +1472,7 @@ func physicalMatchesConfig(entry device.Device, config store.Device) bool {
 		return config.ModemIMEI == entry.Snapshot.IMEI
 	}
 	if config.USBPath != "" && candidate.USBPath != "" {
-		if config.USBPath == candidate.USBPath {
-			return true
-		}
-		// Sysfs paths may be stored through /sys/class symlinks while a
-		// subsequent discovery returns the resolved device path. Keep checking
-		// the selected AT/QMI nodes instead of rejecting a modem whose physical
-		// path spelling changed but whose control plane is unchanged.
+		return config.USBPath == candidate.USBPath
 	}
 	// Control and serial device nodes are allocation-order dependent. They are
 	// only legacy fallbacks when no physical USB path or readable IMEI exists.
@@ -1936,76 +1904,66 @@ func fillConfigFromPhysical(config *store.Device, entry device.Device) {
 func modemSummary(snapshot *device.Snapshot, phone string, phoneSource string) map[string]any {
 	if snapshot == nil {
 		return map[string]any{
-			"operator":                  "",
-			"native_mcc":                "",
-			"native_mnc":                "",
-			"native_spn":                "",
-			"operator_country_code":     "",
-			"card_mcc":                  "",
-			"card_mnc":                  "",
-			"card_country":              "",
-			"home_carrier_name":         "",
-			"home_carrier_plmn":         "",
-			"home_carrier_country_code": "",
-			"service_blocked":           false,
-			"blocked_reason":            "",
-			"network_mode":              "",
-			"radio_band":                "",
-			"radio_channel":             0,
-			"signal_dbm":                0,
-			"signal_sinr":               0,
-			"imei":                      "",
-			"iccid":                     "",
-			"reg_status":                0,
-			"reg_status_text":           "not refreshed",
-			"sim_inserted":              false,
-			"phone_number":              phone,
-			"phone_number_source":       phoneSource,
-			"model":                     "",
+			"operator":              "",
+			"native_mcc":            "",
+			"native_mnc":            "",
+			"native_spn":            "",
+			"operator_country_code": "",
+			"card_mcc":              "",
+			"card_mnc":              "",
+			"card_country":          "",
+			"service_blocked":       false,
+			"blocked_reason":        "",
+			"network_mode":          "",
+			"radio_band":            "",
+			"radio_channel":         0,
+			"signal_dbm":            0,
+			"signal_sinr":           0,
+			"imei":                  "",
+			"iccid":                 "",
+			"reg_status":            0,
+			"reg_status_text":       "not refreshed",
+			"sim_inserted":          false,
+			"phone_number":          phone,
+			"phone_number_source":   phoneSource,
+			"model":                 "",
 		}
 	}
 	mcc, mnc := splitPLMN(snapshot.OperatorCode)
 	_, operatorCountryCode, _ := device.CarrierForPLMN(snapshot.OperatorCode)
-	cardMCC, cardMNC := device.CardMCCMNCWithLength(snapshot.IMSI, snapshot.MNCLength)
-	homePLMN, homeCarrier, homeCountry, _ := device.CarrierForSIM(device.CarrierIdentity{
-		IMSI: snapshot.IMSI, ICCID: snapshot.ICCID, SPN: snapshot.SPN,
-		GID1: snapshot.GID1, GID2: snapshot.GID2, MNCLength: snapshot.MNCLength,
-	})
+	cardMCC, cardMNC := device.CardMCCMNC(snapshot.IMSI)
 	blockedReason := device.RegionBlockReason(snapshot.IMSI)
 	return map[string]any{
-		"operator":                  snapshot.OperatorName,
-		"native_mcc":                mcc,
-		"native_mnc":                mnc,
-		"native_spn":                snapshot.SPN,
-		"operator_country_code":     operatorCountryCode,
-		"card_mcc":                  cardMCC,
-		"card_mnc":                  cardMNC,
-		"card_country":              countryNameForMCC(cardMCC),
-		"home_carrier_name":         homeCarrier,
-		"home_carrier_plmn":         homePLMN,
-		"home_carrier_country_code": homeCountry,
-		"service_blocked":           blockedReason != "",
-		"blocked_reason":            blockedReason,
-		"network_mode":              snapshot.AccessTech,
-		"network_duplex":            "",
-		"radio_band":                snapshot.Band,
-		"radio_channel":             parseDecimal(snapshot.Channel),
-		"signal_dbm":                pointerInt(snapshot.RSSIDBm),
-		"signal_rsrp":               pointerInt(snapshot.RSRP),
-		"signal_rsrq":               pointerInt(snapshot.RSRQ),
-		"signal_sinr":               pointerInt(snapshot.SINR),
-		"imei":                      snapshot.IMEI,
-		"iccid":                     snapshot.ICCID,
-		"imsi":                      snapshot.IMSI,
-		"firmware":                  snapshot.Firmware,
-		"model":                     snapshot.Model,
-		"reg_status":                snapshot.RegistrationStatus,
-		"reg_status_text":           registrationText(snapshot),
-		"ps_attached":               snapshot.PSAttached,
-		"sim_inserted":              snapshotHasSIM(snapshot),
-		"operating_mode":            snapshot.OperatingMode,
-		"phone_number":              phone,
-		"phone_number_source":       phoneSource,
+		"operator":              snapshot.OperatorName,
+		"native_mcc":            mcc,
+		"native_mnc":            mnc,
+		"native_spn":            snapshot.SPN,
+		"operator_country_code": operatorCountryCode,
+		"card_mcc":              cardMCC,
+		"card_mnc":              cardMNC,
+		"card_country":          countryNameForMCC(cardMCC),
+		"service_blocked":       blockedReason != "",
+		"blocked_reason":        blockedReason,
+		"network_mode":          snapshot.AccessTech,
+		"network_duplex":        "",
+		"radio_band":            snapshot.Band,
+		"radio_channel":         parseDecimal(snapshot.Channel),
+		"signal_dbm":            pointerInt(snapshot.RSSIDBm),
+		"signal_rsrp":           pointerInt(snapshot.RSRP),
+		"signal_rsrq":           pointerInt(snapshot.RSRQ),
+		"signal_sinr":           pointerInt(snapshot.SINR),
+		"imei":                  snapshot.IMEI,
+		"iccid":                 snapshot.ICCID,
+		"imsi":                  snapshot.IMSI,
+		"firmware":              snapshot.Firmware,
+		"model":                 snapshot.Model,
+		"reg_status":            snapshot.RegistrationStatus,
+		"reg_status_text":       registrationText(snapshot),
+		"ps_attached":           snapshot.PSAttached,
+		"sim_inserted":          snapshotHasSIM(snapshot),
+		"operating_mode":        snapshot.OperatingMode,
+		"phone_number":          phone,
+		"phone_number_source":   phoneSource,
 	}
 }
 

internal/server/device_discovery_api_test.go

@@ -1,72 +0,0 @@
-package server
-
-import (
-	"context"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"vocat/internal/device"
-	"vocat/internal/modem"
-	"vocat/internal/store"
-)
-
-type discoverySnapshotController struct {
-	fakeDeviceController
-	entries       []device.Device
-	discoverCalls int
-}
-
-func (controller *discoverySnapshotController) Discover(context.Context) ([]device.Device, error) {
-	controller.discoverCalls++
-	return append([]device.Device(nil), controller.entries...), nil
-}
-
-func TestDiscoveredDevicesPerformsFreshScanAndOmitsAbsentEntries(t *testing.T) {
-	database, err := store.Open(context.Background(), ":memory:")
-	if err != nil {
-		t.Fatalf("store.Open: %v", err)
-	}
-	t.Cleanup(func() { _ = database.Close() })
-
-	controller := &discoverySnapshotController{
-		fakeDeviceController: fakeDeviceController{entry: device.Device{
-			ID: "stale-device", Discovered: false,
-			Candidate: modem.Candidate{ID: "stale-device", USBPath: "1-1"},
-		}},
-		entries: []device.Device{
-			{
-				ID: "current-device", Discovered: true,
-				Candidate: modem.Candidate{ID: "current-device", USBPath: "2-1"},
-			},
-			{
-				ID: "absent-device", Discovered: false,
-				Candidate: modem.Candidate{ID: "absent-device", USBPath: "3-1"},
-			},
-		},
-	}
-	server := &Server{
-		store: database, logger: regionTestLogger(),
-		maxRequestBodyBytes: 4096, devices: controller,
-	}
-	request := httptest.NewRequest(http.MethodGet, "/api/devices/discovered", nil)
-	recorder := httptest.NewRecorder()
-
-	if !server.handleDiscoveredDevices(recorder, request) {
-		t.Fatal("handleDiscoveredDevices returned false")
-	}
-	if recorder.Code != http.StatusOK {
-		t.Fatalf("status = %d, body = %s", recorder.Code, recorder.Body.String())
-	}
-	if controller.discoverCalls != 1 {
-		t.Fatalf("Discover calls = %d, want 1", controller.discoverCalls)
-	}
-	body := recorder.Body.String()
-	if !strings.Contains(body, "current-device") {
-		t.Fatalf("response omits current device: %s", body)
-	}
-	if strings.Contains(body, "stale-device") || strings.Contains(body, "absent-device") {
-		t.Fatalf("response contains an absent device: %s", body)
-	}
-}

internal/server/device_features_api_test.go

@@ -31,29 +31,6 @@ func decodeData(t *testing.T, recorder *httptest.ResponseRecorder) map[string]an
 	return envelope.Data
 }
 
-func TestNative410UnsupportedOperations(t *testing.T) {
-	tests := []struct {
-		path        []string
-		unsupported bool
-	}{
-		{path: []string{"esim"}},
-		{path: []string{"esim", "profiles"}},
-		{path: []string{"vowifi"}},
-		{path: []string{"vowifi", "actions", "reconnect"}},
-		{path: []string{"calls"}, unsupported: true},
-		{path: []string{"actions", "reboot"}, unsupported: true},
-		{path: []string{"actions", "refresh"}},
-		{path: []string{"actions", "at"}},
-		{path: []string{"flight-mode"}},
-		{path: []string{"operator_selection"}},
-	}
-	for _, test := range tests {
-		if got := native410UnsupportedOperation(test.path); got != test.unsupported {
-			t.Errorf("native410UnsupportedOperation(%v) = %v, want %v", test.path, got, test.unsupported)
-		}
-	}
-}
-
 func TestParseModemAPNProfiles(t *testing.T) {
 	profiles := parseModemAPNProfiles([]string{
 		`+CGDCONT: 1,"IPV4V6","internet","0.0.0.0",0,0`,
@@ -140,27 +117,6 @@ func TestPhysicalMatchesConfigRejectsDuplicateAndroidSerialAlias(t *testing.T) {
 	}
 }
 
-func TestPhysicalMatchesConfigFallsBackWhenWWANSysfsPathWasResolved(t *testing.T) {
-	config := store.Device{
-		ID:            "wwan0",
-		USBPath:       "/sys/class/wwan/wwan0",
-		ATPort:        "/dev/wwan0at0",
-		ControlDevice: "/dev/wwan0qmi0",
-	}
-	entry := device.Device{
-		ID: "mhi-wwan0",
-		Candidate: modem.Candidate{
-			USBPath:      "/sys/devices/platform/soc/4080000.remoteproc/wwan/wwan0",
-			ATPort:       modem.Port{Path: "/dev/wwan0at0"},
-			QMIControl:   "/dev/wwan0qmi0",
-			HardwareKind: "wwan",
-		},
-	}
-	if !physicalMatchesConfig(entry, config) {
-		t.Fatal("resolved WWAN sysfs path should fall back to matching control nodes")
-	}
-}
-
 func TestFindDiscoveredDevicePrefersPhysicalIdentityOverSerialAlias(t *testing.T) {
 	alias := "/dev/serial/by-id/usb-Android_Android-if02-port0"
 	devices := []device.Device{

internal/server/esim_api.go

@@ -11,7 +11,6 @@ import (
 
 	"vocat/internal/device"
 	"vocat/internal/store"
-	"vocat/internal/vowifi"
 )
 
 func esimUnavailable(w http.ResponseWriter) {
@@ -401,41 +400,15 @@ func (s *Server) handleEsimSwitch(w http.ResponseWriter, r *http.Request, config
 		writeError(w, http.StatusBadRequest, "invalid_request", "iccid is required")
 		return
 	}
-	endMaintenance := func() {}
-	if maintenance, ok := s.vowifi.(VoWiFiMaintenanceController); ok {
-		if err := maintenance.BeginMaintenance(configuredID); err != nil {
-			s.writeDeviceError(w, fmt.Errorf("prepare VoWiFi for profile switch: %w", err))
-			return
-		}
-		released := false
-		endMaintenance = func() {
-			if !released {
-				released = true
-				maintenance.EndMaintenance(configuredID)
-			}
-		}
-		defer endMaintenance()
-	}
-	// A live VoWiFi runtime owns the SIM/QMI session while AKA, IMS and SMS are
-	// active. Tear it down before touching flight mode or the ISD-R logical
-	// channel; otherwise native-WWAN devices wait on the QMI lease until the HTTP
-	// request times out. This only changes the runtime desired state. The saved
-	// per-ICCID policy is left intact and the target profile's policy is restored
-	// after the verified switch below.
-	if err := s.quiesceVoWiFiForProfileSwitch(r.Context(), configuredID); err != nil {
-		s.writeDeviceError(w, err)
-		return
-	}
 	// Profile operations run with RF disabled. The eUICC remains accessible in
-	// CFUN=4. Devices that consume the requested eUICC REFRESH stay online;
-	// older AT modems enter the reset recovery path and reapply CFUN=4 when the
-	// port returns.
+	// CFUN=4, and the recovery path reapplies CFUN=4 as soon as the AT port comes
+	// back after the mandatory modem reset.
 	if _, err := s.devices.SetFlight(r.Context(), physicalID, true); err != nil {
 		s.writeDeviceError(w, err)
 		return
 	}
-	// A confirmed profile switch always includes a live ICCID read and may also
-	// include the EC20 reset fallback, so it can exceed the ordinary deadline.
+	// A confirmed profile switch includes the EC20 reset and a live ICCID read,
+	// which normally takes longer than the server's ordinary response deadline.
 	controller := http.NewResponseController(w)
 	_ = controller.SetWriteDeadline(time.Time{})
 	aidHex := firstNonEmpty(request.AIDHex, request.AIDHexCamel)
@@ -481,10 +454,6 @@ func (s *Server) handleEsimSwitch(w http.ResponseWriter, r *http.Request, config
 		s.writeStoreError(w, err)
 		return
 	}
-	// The target profile is now active and its persisted policy has replaced the
-	// old runtime configuration. Allow reconciliation again before requesting
-	// the target profile's desired VoWiFi state.
-	endMaintenance()
 	canRestoreFlightImmediately := s.vowifi == nil
 	if s.vowifi != nil {
 		state, stateErr := s.vowifi.State(configuredID)
@@ -515,40 +484,6 @@ func (s *Server) handleEsimSwitch(w http.ResponseWriter, r *http.Request, config
 	}})
 }
 
-func (s *Server) quiesceVoWiFiForProfileSwitch(ctx context.Context, configuredID string) error {
-	if s.vowifi == nil {
-		return nil
-	}
-	state, err := s.vowifi.State(configuredID)
-	if err != nil {
-		return fmt.Errorf("stop VoWiFi before switching profile: %w", err)
-	}
-	if !state.Enabled && !state.Active && state.Phase == vowifi.PhaseIdle {
-		return nil
-	}
-	if _, err := s.vowifi.RequestEnabled(configuredID, false); err != nil {
-		return fmt.Errorf("stop VoWiFi before switching profile: %w", err)
-	}
-	waitContext, cancel := context.WithTimeout(ctx, 45*time.Second)
-	defer cancel()
-	ticker := time.NewTicker(100 * time.Millisecond)
-	defer ticker.Stop()
-	for {
-		state, err = s.vowifi.State(configuredID)
-		if err != nil {
-			return fmt.Errorf("wait for VoWiFi to stop before switching profile: %w", err)
-		}
-		if !state.Enabled && !state.Active && state.Phase == vowifi.PhaseIdle {
-			return nil
-		}
-		select {
-		case <-waitContext.Done():
-			return fmt.Errorf("wait for VoWiFi to stop before switching profile: %w", waitContext.Err())
-		case <-ticker.C:
-		}
-	}
-}
-
 func (s *Server) handleEsimDisable(w http.ResponseWriter, r *http.Request, physicalID string, physicalPresent bool) {
 	if s.devices == nil {
 		writeError(w, http.StatusServiceUnavailable, "device_manager_unavailable", "device manager is unavailable")

internal/server/general_api.go

@@ -506,7 +506,7 @@ func (s *Server) handlePasswordChange(w http.ResponseWriter, r *http.Request) {
 		switch {
 		case errors.Is(err, auth.ErrInvalidCredentials):
 			writeError(w, http.StatusUnauthorized, "invalid_credentials", "current password is incorrect")
-		case errors.Is(err, auth.ErrEmptyPassword):
+		case strings.Contains(err.Error(), "between 12 and 1024"):
 			writeError(w, http.StatusBadRequest, "weak_password", err.Error())
 		case strings.Contains(err.Error(), "must differ"):
 			writeError(w, http.StatusBadRequest, "password_reused", err.Error())

internal/server/server.go

@@ -167,11 +167,6 @@ type VoWiFiController interface {
 	RequestReconnect(string) (vowifi.State, error)
 }
 
-type VoWiFiMaintenanceController interface {
-	BeginMaintenance(string) error
-	EndMaintenance(string)
-}
-
 type VoWiFiCallController interface {
 	Calls(string) ([]vowifi.Call, error)
 	DialCall(context.Context, string, string) (vowifi.Call, error)

internal/server/settings_api.go

@@ -29,7 +29,7 @@ import (
 )
 
 var (
-	errUnsafeDestination = errors.New("notification destination is not allowed")
+	errUnsafeDestination = errors.New("notification destination is not public")
 	errProviderRejected  = errors.New("notification provider rejected the test")
 	telegramTokenPattern = regexp.MustCompile(`^[0-9]{5,20}:[A-Za-z0-9_-]{20,128}$`)
 )
@@ -429,18 +429,17 @@ func (s *Server) handleNotificationTest(
 		return
 	}
 
-	notificationContext := s.notificationDestinationContext(r.Context())
 	switch channel {
 	case "webhook":
-		err = sendWebhookNotificationTest(notificationContext, resolved)
+		err = sendWebhookNotificationTest(r.Context(), resolved)
 	case "telegram":
-		err = sendTelegramNotificationTest(notificationContext, resolved)
+		err = sendTelegramNotificationTest(r.Context(), resolved)
 	case "email":
-		err = sendEmailNotificationTest(notificationContext, resolved)
+		err = sendEmailNotificationTest(r.Context(), resolved)
 	case "bark":
-		err = sendBarkNotificationTest(notificationContext, resolved)
+		err = sendBarkNotificationTest(r.Context(), resolved)
 	case "wecom":
-		err = sendWecomNotificationTest(notificationContext, resolved)
+		err = sendWecomNotificationTest(r.Context(), resolved)
 	}
 	if err != nil {
 		redacted := store.RedactText(err.Error(), provider)
@@ -459,7 +458,7 @@ func (s *Server) handleNotificationTest(
 				w,
 				http.StatusBadRequest,
 				"unsafe_destination",
-				"notification destination resolved to an unusable or protected system address",
+				"notification destination must resolve only to public network addresses",
 			)
 		case errors.Is(err, errProviderRejected):
 			writeError(
@@ -905,12 +904,11 @@ func restrictedHTTPClient(
 		},
 	}
 	if strings.TrimSpace(proxy) != "" {
-		parsed, err := validateNotificationProxyURL(ctx, proxy)
+		parsed, err := validateOutboundURL(ctx, proxy, false)
 		if err != nil {
 			return nil, fmt.Errorf("validate notification proxy: %w", err)
 		}
 		transport.Proxy = http.ProxyURL(parsed)
-		transport.DialContext = notificationProxyDialer(timeout)
 	}
 	return &http.Client{
 		Transport: transport,
@@ -953,17 +951,6 @@ func validateOutboundURL(
 	return parsed, nil
 }
 
-func validateNotificationProxyURL(ctx context.Context, raw string) (*url.URL, error) {
-	parsed, err := parseOutboundURL(raw, false)
-	if err != nil {
-		return nil, err
-	}
-	if _, err := resolveNotificationProxyAddresses(ctx, parsed.Hostname()); err != nil {
-		return nil, err
-	}
-	return parsed, nil
-}
-
 func parseOutboundURL(raw string, requireHTTPS bool) (*url.URL, error) {
 	parsed, err := url.Parse(strings.TrimSpace(raw))
 	if err != nil || parsed.Hostname() == "" || parsed.IsAbs() == false {
@@ -997,42 +984,17 @@ func restrictedDialer(timeout time.Duration) func(
 	}
 }
 
-func notificationProxyDialer(timeout time.Duration) func(
-	context.Context,
-	string,
-	string,
-) (net.Conn, error) {
-	return func(ctx context.Context, network string, address string) (net.Conn, error) {
-		return dialNotification(ctx, network, address, timeout, true)
-	}
-}
-
 func dialRestricted(
 	ctx context.Context,
 	network string,
 	address string,
 	timeout time.Duration,
-) (net.Conn, error) {
-	return dialNotification(ctx, network, address, timeout, false)
-}
-
-func dialNotification(
-	ctx context.Context,
-	network string,
-	address string,
-	timeout time.Duration,
-	allowLocal bool,
 ) (net.Conn, error) {
 	host, port, err := net.SplitHostPort(address)
 	if err != nil {
 		return nil, fmt.Errorf("parse outbound address: %w", err)
 	}
-	var addresses []netip.Addr
-	if allowLocal {
-		addresses, err = resolveNotificationProxyAddresses(ctx, host)
-	} else {
-		addresses, err = resolvePublicAddresses(ctx, host)
-	}
+	addresses, err := resolvePublicAddresses(ctx, host)
 	if err != nil {
 		return nil, err
 	}
@@ -1108,68 +1070,21 @@ func dialNotification(
 	if len(failures) == 0 {
 		return nil, ctx.Err()
 	}
-	return nil, fmt.Errorf("dial notification destination: %w", errors.Join(failures...))
-}
-
-func (s *Server) notificationDestinationContext(ctx context.Context) context.Context {
-	if ctx == nil {
-		return context.Background()
-	}
-	// Notification delivery is outbound administrator-configured traffic. It
-	// must not inherit the inbound Web access policy: DNS Fake-IP ranges, LAN
-	// gateways, and local proxies are valid notification paths.
-	return ctx
-}
-
-func notificationAddressAllowed(_ context.Context, address netip.Addr) bool {
-	address = address.Unmap()
-	if !notificationTransportAddress(address) {
-		return false
-	}
-	for _, fakeIP := range notificationFakeIPNetworks {
-		if fakeIP.Contains(address) {
-			return true
-		}
-	}
-	if !address.IsGlobalUnicast() {
-		return false
-	}
-	for _, blocked := range blockedNotificationDestinationNetworks {
-		if blocked.Contains(address) {
-			return false
-		}
-	}
-	return true
-}
-
-func notificationProxyAddressAllowed(address netip.Addr) bool {
-	return notificationTransportAddress(address.Unmap())
-}
-
-func notificationTransportAddress(address netip.Addr) bool {
-	return address.IsValid() && !address.IsUnspecified() && !address.IsMulticast() &&
-		!address.IsLinkLocalUnicast() && !address.IsLinkLocalMulticast() &&
-		address != netip.MustParseAddr("255.255.255.255") &&
-		address != netip.MustParseAddr("100.100.100.200")
+	return nil, fmt.Errorf("dial public notification destination: %w", errors.Join(failures...))
 }
 
 func resolvePublicAddresses(ctx context.Context, host string) ([]netip.Addr, error) {
-	return resolveNotificationAddresses(ctx, host, false)
-}
-
-func resolveNotificationProxyAddresses(ctx context.Context, host string) ([]netip.Addr, error) {
-	return resolveNotificationAddresses(ctx, host, true)
-}
-
-func resolveNotificationAddresses(ctx context.Context, host string, allowLocal bool) ([]netip.Addr, error) {
 	normalized := strings.ToLower(strings.TrimSuffix(strings.TrimSpace(host), "."))
-	if normalized == "" {
+	if normalized == "" || normalized == "localhost" ||
+		strings.HasSuffix(normalized, ".localhost") ||
+		normalized == "metadata" ||
+		strings.HasSuffix(normalized, ".internal") ||
+		strings.HasSuffix(normalized, ".local") {
 		return nil, fmt.Errorf("%w: blocked host name", errUnsafeDestination)
 	}
 	if literal, err := netip.ParseAddr(normalized); err == nil {
 		literal = literal.Unmap()
-		if (!allowLocal && !notificationAddressAllowed(ctx, literal)) ||
-			(allowLocal && !notificationProxyAddressAllowed(literal)) {
+		if !publicNotificationAddress(literal) {
 			return nil, fmt.Errorf("%w: %s", errUnsafeDestination, literal)
 		}
 		return []netip.Addr{literal}, nil
@@ -1184,8 +1099,7 @@ func resolveNotificationAddresses(ctx context.Context, host string, allowLocal b
 	result := make([]netip.Addr, 0, len(addresses))
 	for _, address := range addresses {
 		address = address.Unmap()
-		if (!allowLocal && !notificationAddressAllowed(ctx, address)) ||
-			(allowLocal && !notificationProxyAddressAllowed(address)) {
+		if !publicNotificationAddress(address) {
 			return nil, fmt.Errorf("%w: %s", errUnsafeDestination, address)
 		}
 		result = append(result, address)
@@ -1193,11 +1107,7 @@ func resolveNotificationAddresses(ctx context.Context, host string, allowLocal b
 	return result, nil
 }
 
-var notificationFakeIPNetworks = []netip.Prefix{
-	netip.MustParsePrefix("198.18.0.0/15"),
-}
-
-var blockedNotificationDestinationNetworks = []netip.Prefix{
+var blockedNotificationNetworks = []netip.Prefix{
 	netip.MustParsePrefix("0.0.0.0/8"),
 	netip.MustParsePrefix("10.0.0.0/8"),
 	netip.MustParsePrefix("100.64.0.0/10"),
@@ -1208,6 +1118,7 @@ var blockedNotificationDestinationNetworks = []netip.Prefix{
 	netip.MustParsePrefix("192.0.2.0/24"),
 	netip.MustParsePrefix("192.88.99.0/24"),
 	netip.MustParsePrefix("192.168.0.0/16"),
+	netip.MustParsePrefix("198.18.0.0/15"),
 	netip.MustParsePrefix("198.51.100.0/24"),
 	netip.MustParsePrefix("203.0.113.0/24"),
 	netip.MustParsePrefix("224.0.0.0/4"),
@@ -1222,6 +1133,19 @@ var blockedNotificationDestinationNetworks = []netip.Prefix{
 	netip.MustParsePrefix("ff00::/8"),
 }
 
+func publicNotificationAddress(address netip.Addr) bool {
+	if !address.IsValid() || !address.IsGlobalUnicast() {
+		return false
+	}
+	address = address.Unmap()
+	for _, blocked := range blockedNotificationNetworks {
+		if blocked.Contains(address) {
+			return false
+		}
+	}
+	return true
+}
+
 func configString(config map[string]any, key string) string {
 	value, _ := config[key].(string)
 	return strings.TrimSpace(value)

internal/server/settings_api_test.go

@@ -369,10 +369,6 @@ func TestNotificationTestsBlockSSRFAndUnsupportedChannels(t *testing.T) {
 	if recorder.Code != http.StatusBadRequest {
 		t.Fatalf("Telegram metadata status = %d, body = %s", recorder.Code, recorder.Body)
 	}
-	response = decodeSettingsResponse(t, recorder)
-	if response["error"].(map[string]any)["code"] != "unsafe_destination" {
-		t.Fatalf("Telegram metadata response = %#v", response)
-	}
 
 	recorder = test.request(
 		t,
@@ -766,28 +762,26 @@ func TestTrafficAnalysisIsUnavailableOutsideDeveloperMode(t *testing.T) {
 	}
 }
 
-func TestNotificationDestinationAddressPolicyIsIndependentFromWebAccess(t *testing.T) {
+func TestNotificationDestinationAddressPolicy(t *testing.T) {
 	blocked := []string{
 		"0.0.0.0", "10.0.0.1", "100.100.100.200", "127.0.0.1",
-		"169.254.169.254", "172.16.0.1", "192.168.1.1", "224.0.0.1",
-		"255.255.255.255", "::", "::1", "fc00::1", "fe80::1", "ff02::1",
+		"169.254.169.254", "172.16.0.1", "192.168.1.1", "198.18.0.1",
+		"::1", "fc00::1", "fe80::1", "2001:db8::1",
 	}
 	for _, text := range blocked {
 		address := netip.MustParseAddr(text)
-		if notificationAddressAllowed(context.Background(), address) {
-			t.Errorf("%s was incorrectly accepted for notification transport", text)
+		if publicNotificationAddress(address) {
+			t.Errorf("%s was incorrectly accepted as public", text)
 		}
 	}
-	for _, text := range []string{
-		"1.1.1.1", "198.18.0.1", "2606:4700:4700::1111",
-	} {
+	for _, text := range []string{"1.1.1.1", "8.8.8.8", "2606:4700:4700::1111"} {
 		address := netip.MustParseAddr(text)
-		if !notificationAddressAllowed(context.Background(), address) {
-			t.Errorf("%s was incorrectly blocked for notification transport", text)
+		if !publicNotificationAddress(address) {
+			t.Errorf("%s was incorrectly blocked", text)
 		}
 	}
 	if _, err := resolvePublicAddresses(context.Background(), "localhost"); err == nil {
-		t.Fatal("local notification destination was not blocked")
+		t.Fatal("localhost was not blocked")
 	}
 	if _, err := resolvePublicAddresses(
 		context.Background(),
@@ -795,53 +789,6 @@ func TestNotificationDestinationAddressPolicyIsIndependentFromWebAccess(t *testi
 	); err == nil {
 		t.Fatal("metadata IP was not blocked")
 	}
-	server := &Server{access: parsedAccessConfig{mode: "internal"}}
-	notificationContext := server.notificationDestinationContext(context.Background())
-	if addresses, err := resolvePublicAddresses(notificationContext, "198.18.0.1"); err != nil || len(addresses) != 1 {
-		t.Fatalf("Fake-IP notification destination = %v, %v", addresses, err)
-	}
-}
-
-func TestNotificationProxyAcceptsLocalAddressWithoutWebAccessAllowlist(t *testing.T) {
-	server := &Server{access: parsedAccessConfig{mode: "internal"}}
-	ctx := server.notificationDestinationContext(context.Background())
-	for _, host := range []string{"127.0.0.1", "10.0.0.1", "192.168.1.1", "198.18.0.1", "::1"} {
-		if addresses, err := resolveNotificationProxyAddresses(ctx, host); err != nil || len(addresses) != 1 {
-			t.Errorf("local notification proxy %s = %v, %v", host, addresses, err)
-		}
-	}
-	if _, err := resolveNotificationProxyAddresses(ctx, "169.254.169.254"); err == nil {
-		t.Fatal("cloud metadata address was accepted as a notification proxy")
-	}
-}
-
-func TestRestrictedNotificationClientConnectsThroughLocalProxy(t *testing.T) {
-	var hits atomic.Int32
-	proxy := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, request *http.Request) {
-		hits.Add(1)
-		if request.URL.Host != "1.1.1.1" {
-			t.Errorf("proxy request host = %q", request.URL.Host)
-		}
-		w.WriteHeader(http.StatusNoContent)
-	}))
-	defer proxy.Close()
-
-	client, err := restrictedHTTPClient(context.Background(), 2*time.Second, proxy.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	request, err := http.NewRequest(http.MethodGet, "http://1.1.1.1/test", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	response, err := client.Do(request)
-	if err != nil {
-		t.Fatal(err)
-	}
-	_ = response.Body.Close()
-	if response.StatusCode != http.StatusNoContent || hits.Load() != 1 {
-		t.Fatalf("local proxy status = %d, hits = %d", response.StatusCode, hits.Load())
-	}
 }
 
 func TestRestrictedNotificationClientCapsTimeoutAndRedirects(t *testing.T) {

internal/server/sms_api.go

@@ -236,10 +236,6 @@ func (s *Server) handleSMSSend(w http.ResponseWriter, r *http.Request) {
 		s.writeStoreError(w, err)
 		return
 	}
-	if store.NormalizeDeviceType(config.DeviceType) == store.DeviceTypeWiFi410 {
-		writeError(w, http.StatusNotImplemented, "device_feature_unsupported", "SMS is not supported by the native OpenStick 410 backend")
-		return
-	}
 	entry, physicalID, present := s.physicalForConfig(config)
 	if !s.requirePhysicalDevice(w, present) {
 		return
@@ -671,8 +667,7 @@ func (s *Server) syncModemSMS(ctx context.Context, onlyDevice string) {
 }
 
 func supportsModemSMSStorage(config store.Device) bool {
-	deviceType := store.NormalizeDeviceType(config.DeviceType)
-	return deviceType != store.DeviceTypeUSBSIMReader && deviceType != store.DeviceTypeWiFi410
+	return store.NormalizeDeviceType(config.DeviceType) != store.DeviceTypeUSBSIMReader
 }
 
 func shouldDeferModemSMSSync(state vowifi.State, stateErr error) bool {

internal/server/sms_api_test.go

@@ -57,15 +57,6 @@ func TestSMSThreadAllDevicesUsesIMSIFilter(t *testing.T) {
 	}
 }
 
-func TestNative410DoesNotUseModemSMSStorage(t *testing.T) {
-	if supportsModemSMSStorage(store.Device{DeviceType: store.DeviceTypeWiFi410}) {
-		t.Fatal("native OpenStick 410 unexpectedly enabled modem SMS storage polling")
-	}
-	if !supportsModemSMSStorage(store.Device{DeviceType: store.DeviceTypePCIeEC20EC25}) {
-		t.Fatal("EC20 modem SMS storage polling was disabled")
-	}
-}
-
 func TestSMSThreadConfiguredDeviceUsesStableIMEI(t *testing.T) {
 	ctx := context.Background()
 	database, err := store.Open(ctx, ":memory:")

internal/server/sms_notifications.go

@@ -105,7 +105,7 @@ func (s *Server) runSMSNotificationChannel(ctx context.Context, channel string)
 			} else {
 				for _, message := range messages {
 					notification := s.newSMSNotification(ctx, message)
-					if sendErr := sendSMSNotification(s.notificationDestinationContext(ctx), channel, config, notification); sendErr != nil {
+					if sendErr := sendSMSNotification(ctx, channel, config, notification); sendErr != nil {
 						if sendErr.Error() != lastError || time.Since(lastErrorAt) >= time.Minute {
 							s.logSMSNotificationError(channel, sendErr)
 							lastError, lastErrorAt = sendErr.Error(), time.Now()

internal/server/telegram_bot.go

@@ -850,7 +850,7 @@ func (bot *telegramBot) sendDeviceStatus(ctx context.Context, config telegramRun
 					"ICCID："+firstNonEmpty(snapshot.ICCID, "--"),
 					"IMSI："+firstNonEmpty(snapshot.IMSI, "--"),
 					"号码："+resolveTelegramPhoneNumber(associationNumber, wfcState, snapshot),
-					"原运营商："+telegramSnapshotHomeCarrier(snapshot),
+					"原运营商："+telegramHomeCarrier(snapshot.IMSI, snapshot.SPN),
 					"当前网络："+telegramCurrentNetwork(snapshot),
 					"蜂窝模式："+map[bool]string{true: "飞行模式", false: "开启"}[snapshot.FlightMode],
 				)
@@ -929,31 +929,21 @@ func usableTelegramPhoneNumber(value string) bool {
 }
 
 func telegramHomeCarrier(imsi string, spn ...string) string {
-	identity := device.CarrierIdentity{IMSI: imsi}
-	if len(spn) > 0 {
-		identity.SPN = spn[0]
-	}
-	return telegramResolvedHomeCarrier(identity)
-}
-
-func telegramSnapshotHomeCarrier(snapshot *device.Snapshot) string {
-	if snapshot == nil {
-		return "--"
-	}
-	return telegramResolvedHomeCarrier(device.CarrierIdentity{
-		IMSI: snapshot.IMSI, ICCID: snapshot.ICCID, SPN: snapshot.SPN,
-		GID1: snapshot.GID1, GID2: snapshot.GID2, MNCLength: snapshot.MNCLength,
-	})
-}
-
-func telegramResolvedHomeCarrier(identity device.CarrierIdentity) string {
-	plmn, name, country, ok := device.CarrierForSIM(identity)
+	plmn, name, country, ok := device.CarrierForIMSI(imsi)
 	if !ok {
-		if strings.TrimSpace(identity.SPN) != "" {
-			return strings.TrimSpace(identity.SPN)
+		if len(spn) > 0 && strings.TrimSpace(spn[0]) != "" {
+			return strings.TrimSpace(spn[0])
 		}
 		return "--"
 	}
+	if len(spn) > 0 && strings.TrimSpace(spn[0]) != "" {
+		brand := strings.TrimSpace(spn[0])
+		brandCountry := country
+		if strings.Contains(strings.ToLower(brand), "lebara") && strings.HasPrefix(strings.TrimSpace(imsi), "20404") {
+			brandCountry = "GB"
+		}
+		return strings.TrimSpace(strings.Join([]string{telegramCountryFlag(brandCountry), brand, "（认证核心 " + plmn + "）"}, " "))
+	}
 	return strings.TrimSpace(strings.Join([]string{telegramCountryFlag(country), name, "(" + plmn + ")"}, " "))
 }
 
@@ -2328,11 +2318,6 @@ func (bot *telegramBot) loadConfig(ctx context.Context) (telegramRuntimeConfig,
 }
 
 func (bot *telegramBot) call(ctx context.Context, config telegramRuntimeConfig, method string, payload any, result any) error {
-	// Telegram polling is a long-lived notification channel and must use the
-	// same administrator-configured destination exceptions as test messages,
-	// SMS pushes and automatic-task notifications. This keeps SSRF protection
-	// enabled while allowing explicit DNS Fake-IP ranges such as 198.18/15.
-	ctx = bot.notificationDestinationContext(ctx)
 	base, err := validateTelegramAPIURL(ctx, config.BaseURL, config.Token, method)
 	if err != nil {
 		return redactTelegramError(err, config.Token)
@@ -2375,13 +2360,6 @@ func (bot *telegramBot) call(ctx context.Context, config telegramRuntimeConfig,
 	return nil
 }
 
-func (bot *telegramBot) notificationDestinationContext(ctx context.Context) context.Context {
-	if bot.server == nil {
-		return ctx
-	}
-	return bot.server.notificationDestinationContext(ctx)
-}
-
 func (bot *telegramBot) sendText(ctx context.Context, config telegramRuntimeConfig, chatID int64, text string, replyMarkup any) error {
 	target := config.ChatID
 	if chatID != 0 {

internal/server/telegram_bot_test.go

@@ -57,17 +57,6 @@ func TestTelegramAPIURLRejectsMalformedTemplates(t *testing.T) {
 	}
 }
 
-func TestTelegramPollingAcceptsFakeIPWithoutWebAccessAllowlist(t *testing.T) {
-	bot := &telegramBot{server: &Server{access: parsedAccessConfig{mode: "internal"}}}
-	ctx := bot.notificationDestinationContext(context.Background())
-	if _, err := validateTelegramAPIURL(ctx, "https://198.18.0.34", "123456:test-token", "getUpdates"); err != nil {
-		t.Fatalf("explicitly allowed Telegram Fake-IP was rejected: %v", err)
-	}
-	if _, err := validateTelegramAPIURL(ctx, "https://169.254.169.254", "123456:test-token", "getUpdates"); err == nil {
-		t.Fatal("metadata address became reachable through Telegram allowlist")
-	}
-}
-
 func TestParseTelegramCommand(t *testing.T) {
 	command, remainder := parseTelegramCommand("  /sms@vocat_bot EC20 +447700900123 hello world  ")
 	if command != "sms" || remainder != "EC20 +447700900123 hello world" {
@@ -138,11 +127,8 @@ func TestTelegramCarrierPresentationSeparatesHomeAndServingNetworks(t *testing.T
 	if got := telegramHomeCarrier("234336570710174"); !strings.Contains(got, "🇬🇧") || !strings.Contains(got, "23433") {
 		t.Fatalf("home carrier = %q", got)
 	}
-	if got := telegramHomeCarrier("454006395879502", "Saily"); !strings.Contains(got, "1O1O / csl / Club Sim") || !strings.Contains(got, "45400") || !strings.Contains(got, "🇭🇰") || strings.Contains(got, "Saily") {
-		t.Fatalf("profile brand overrode home carrier = %q", got)
-	}
-	if got := telegramHomeCarrier("999991234567890", "Unknown Brand"); got != "Unknown Brand" {
-		t.Fatalf("unknown home carrier did not fall back to SPN: %q", got)
+	if got := telegramHomeCarrier("204040123456789", "Lebara"); !strings.Contains(got, "Lebara") || !strings.Contains(got, "20404") || !strings.Contains(got, "🇬🇧") || strings.Contains(got, "🇳🇱") {
+		t.Fatalf("branded foreign-core carrier = %q", got)
 	}
 	flight := &device.Snapshot{FlightMode: true, OperatorName: "stale network", RegistrationStatus: 1}
 	if got := telegramCurrentNetwork(flight); got != "--（飞行模式）" {

internal/store/domain_test.go

@@ -220,124 +220,6 @@ func TestMigration8DefaultsExistingDevicesToPCIeType(t *testing.T) {
 	}
 }
 
-func TestMigration19AcceptsDevelopmentDatabaseAndPreservesCardData(t *testing.T) {
-	ctx := context.Background()
-	path := filepath.Join(t.TempDir(), "development-schema.db")
-	raw, err := sql.Open("sqlite", path)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for version := 1; version <= 16; version++ {
-		for _, statement := range migrationStatements(version) {
-			if _, err := raw.ExecContext(ctx, statement); err != nil {
-				t.Fatalf("create v%d schema: %v", version, err)
-			}
-		}
-	}
-	if _, err := raw.ExecContext(ctx, `
-		INSERT INTO devices (id, name, created_at, updated_at)
-		VALUES ('ec20-1', 'EC20', 100, 100);
-		INSERT INTO card_policies (
-			iccid, network_enabled, vowifi_enabled, airplane_enabled,
-			apn, ip_version, source, created_at, updated_at, custom_phone_number
-		) VALUES (
-			'8900000000000000019', 0, 1, 1,
-			'ims', 'IPV4V6', 'user', 100, 100, '447700900019'
-		);
-		INSERT INTO card_apn_profiles (
-			iccid, apn, ip_version, created_at, updated_at,
-			username, password, proxy, mcc, mnc, roaming_ip_version, auth_type
-		) VALUES (
-			'8900000000000000019', 'mobile.example', 'IPV4V6', 100, 100,
-			'user', 'secret', '', '234', '10', 'IP', 'PAP'
-		);
-		PRAGMA user_version = 16;
-	`); err != nil {
-		t.Fatal(err)
-	}
-	if err := raw.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	database := openTestStore(t, path)
-	policy, err := database.CardPolicy(ctx, "8900000000000000019")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !policy.VoWiFiEnabled || !policy.AirplaneEnabled || policy.CustomPhoneNumber != "447700900019" {
-		t.Fatalf("migrated card policy = %#v", policy)
-	}
-	profiles, err := database.ListCardAPNProfiles(ctx, "8900000000000000019")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(profiles) != 1 || profiles[0].APN != "mobile.example" || profiles[0].Username != "user" || profiles[0].AuthType != "PAP" {
-		t.Fatalf("migrated APN profiles = %#v", profiles)
-	}
-
-	var version int
-	if err := database.db.QueryRowContext(ctx, `PRAGMA user_version`).Scan(&version); err != nil {
-		t.Fatal(err)
-	}
-	if version != 19 {
-		t.Fatalf("schema version = %d, want 19", version)
-	}
-	for _, column := range []string{
-		"ims_apn", "ims_private_identity", "ims_public_identity", "ims_sms_center",
-		"ims_transport", "ims_allow_imsi_derived_identity", "vowifi_eap_method",
-		"vowifi_allow_sha1", "vowifi_use_modp1024",
-	} {
-		var count int
-		if err := database.db.QueryRowContext(ctx, `
-			SELECT COUNT(*) FROM pragma_table_info('devices') WHERE name = ?
-		`, column).Scan(&count); err != nil {
-			t.Fatal(err)
-		}
-		if count != 1 {
-			t.Fatalf("migration 19 column %q count = %d", column, count)
-		}
-	}
-}
-
-func TestMigration19AcceptsDevelopmentColumnsAlreadyPresent(t *testing.T) {
-	ctx := context.Background()
-	path := filepath.Join(t.TempDir(), "development-columns.db")
-	raw, err := sql.Open("sqlite", path)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for version := 1; version <= 18; version++ {
-		for _, statement := range migrationStatements(version) {
-			if _, err := raw.ExecContext(ctx, statement); err != nil {
-				t.Fatalf("create v%d schema: %v", version, err)
-			}
-		}
-	}
-	// The development build added these columns while still reporting schema
-	// 18. Migration 19 must treat that layout as compatible rather than fail on
-	// the first duplicate ALTER TABLE statement.
-	for _, statement := range migrationStatements(19) {
-		if _, err := raw.ExecContext(ctx, statement); err != nil {
-			t.Fatalf("create development column: %v", err)
-		}
-	}
-	if _, err := raw.ExecContext(ctx, `PRAGMA user_version = 18`); err != nil {
-		t.Fatal(err)
-	}
-	if err := raw.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	database := openTestStore(t, path)
-	var version int
-	if err := database.db.QueryRowContext(ctx, `PRAGMA user_version`).Scan(&version); err != nil {
-		t.Fatal(err)
-	}
-	if version != 19 {
-		t.Fatalf("schema version = %d, want 19", version)
-	}
-}
-
 func TestMigration4PreservesIMSRedeliveryAndUsesReceiptTime(t *testing.T) {
 	ctx := context.Background()
 	path := filepath.Join(t.TempDir(), "ims-redelivery.db")

internal/store/migrations.go

@@ -264,123 +264,6 @@ func migrationStatements(version int) []string {
 		return []string{
 			`ALTER TABLE devices ADD COLUMN sim_pin TEXT NOT NULL DEFAULT ''`,
 		}
-	case 17:
-		// Some development builds recorded automatic-task support in an older
-		// migration. Recreate the objects idempotently so databases from either
-		// history converge before later migrations run.
-		return []string{
-			`CREATE TABLE IF NOT EXISTS automatic_tasks (
-				id INTEGER PRIMARY KEY AUTOINCREMENT,
-				name TEXT NOT NULL,
-				enabled INTEGER NOT NULL DEFAULT 1 CHECK (enabled IN (0, 1)),
-				device_id TEXT NOT NULL,
-				profile_iccid TEXT NOT NULL,
-				profile_aid TEXT NOT NULL DEFAULT '',
-				task_type TEXT NOT NULL CHECK (task_type IN ('sms', 'call', 'public_ip')),
-				environment TEXT NOT NULL CHECK (environment IN ('vowifi', 'cellular')),
-				interval_days INTEGER NOT NULL CHECK (interval_days BETWEEN 1 AND 365),
-				start_date TEXT NOT NULL,
-				run_time TEXT NOT NULL,
-				timezone TEXT NOT NULL DEFAULT 'Local',
-				payload_json TEXT NOT NULL DEFAULT '{}',
-				retry_count INTEGER NOT NULL DEFAULT 0 CHECK (retry_count BETWEEN 0 AND 10),
-				notify INTEGER NOT NULL DEFAULT 0 CHECK (notify IN (0, 1)),
-				next_run_at INTEGER NOT NULL,
-				last_run_at INTEGER NOT NULL DEFAULT 0,
-				last_status TEXT NOT NULL DEFAULT '',
-				last_error TEXT NOT NULL DEFAULT '',
-				created_at INTEGER NOT NULL,
-				updated_at INTEGER NOT NULL,
-				FOREIGN KEY (device_id) REFERENCES devices(id) ON DELETE CASCADE
-			)`,
-			`CREATE INDEX IF NOT EXISTS automatic_tasks_due_idx ON automatic_tasks(enabled, next_run_at, id)`,
-			`CREATE INDEX IF NOT EXISTS automatic_tasks_device_idx ON automatic_tasks(device_id, next_run_at, id)`,
-			`CREATE TABLE IF NOT EXISTS automatic_task_runs (
-				id INTEGER PRIMARY KEY AUTOINCREMENT,
-				task_id INTEGER NOT NULL,
-				device_id TEXT NOT NULL,
-				scheduled_at INTEGER NOT NULL,
-				started_at INTEGER NOT NULL DEFAULT 0,
-				finished_at INTEGER NOT NULL DEFAULT 0,
-				status TEXT NOT NULL CHECK (status IN ('queued', 'running', 'success', 'failed')),
-				attempts INTEGER NOT NULL DEFAULT 0,
-				output TEXT NOT NULL DEFAULT '',
-				error TEXT NOT NULL DEFAULT '',
-				created_at INTEGER NOT NULL,
-				updated_at INTEGER NOT NULL,
-				FOREIGN KEY (task_id) REFERENCES automatic_tasks(id) ON DELETE CASCADE
-			)`,
-			`CREATE INDEX IF NOT EXISTS automatic_task_runs_task_idx ON automatic_task_runs(task_id, id DESC)`,
-			`CREATE INDEX IF NOT EXISTS automatic_task_runs_status_idx ON automatic_task_runs(status, id)`,
-		}
-	case 18:
-		// A short-lived schema lineage kept the original card-policy CHECK,
-		// which rejected the supported VoWiFi + airplane-mode state. Rebuild
-		// both related tables so all released and development databases converge
-		// without dropping policies or custom APNs.
-		return []string{
-			`ALTER TABLE card_apn_profiles RENAME TO card_apn_profiles_v17`,
-			`ALTER TABLE card_policies RENAME TO card_policies_v17`,
-			`CREATE TABLE card_policies (
-				iccid TEXT PRIMARY KEY,
-				network_enabled INTEGER NOT NULL DEFAULT 0 CHECK (network_enabled IN (0, 1)),
-				vowifi_enabled INTEGER NOT NULL DEFAULT 0 CHECK (vowifi_enabled IN (0, 1)),
-				airplane_enabled INTEGER NOT NULL DEFAULT 0 CHECK (airplane_enabled IN (0, 1)),
-				apn TEXT NOT NULL DEFAULT '',
-				ip_version TEXT NOT NULL DEFAULT '',
-				source TEXT NOT NULL DEFAULT '',
-				created_at INTEGER NOT NULL,
-				updated_at INTEGER NOT NULL,
-				custom_phone_number TEXT NOT NULL DEFAULT ''
-			)`,
-			`INSERT INTO card_policies (
-				iccid, network_enabled, vowifi_enabled, airplane_enabled,
-				apn, ip_version, source, created_at, updated_at, custom_phone_number
-			) SELECT
-				iccid, network_enabled, vowifi_enabled, airplane_enabled,
-				apn, ip_version, source, created_at, updated_at, custom_phone_number
-			FROM card_policies_v17`,
-			`CREATE TABLE card_apn_profiles_new (
-				id INTEGER PRIMARY KEY AUTOINCREMENT,
-				iccid TEXT NOT NULL,
-				apn TEXT NOT NULL,
-				ip_version TEXT NOT NULL DEFAULT 'IPV4V6' CHECK (ip_version IN ('IP', 'IPV6', 'IPV4V6')),
-				created_at INTEGER NOT NULL,
-				updated_at INTEGER NOT NULL,
-				username TEXT NOT NULL DEFAULT '',
-				password TEXT NOT NULL DEFAULT '',
-				proxy TEXT NOT NULL DEFAULT '',
-				mcc TEXT NOT NULL DEFAULT '',
-				mnc TEXT NOT NULL DEFAULT '',
-				roaming_ip_version TEXT NOT NULL DEFAULT 'IP' CHECK (roaming_ip_version IN ('IP', 'IPV6', 'IPV4V6')),
-				auth_type TEXT NOT NULL DEFAULT 'NONE' CHECK (auth_type IN ('NONE', 'PAP', 'CHAP', 'PAP_OR_CHAP')),
-				UNIQUE (iccid, apn, ip_version),
-				FOREIGN KEY (iccid) REFERENCES card_policies(iccid) ON DELETE CASCADE
-			)`,
-			`INSERT INTO card_apn_profiles_new
-				SELECT id, iccid, apn, ip_version, created_at, updated_at,
-					username, password, proxy, mcc, mnc, roaming_ip_version, auth_type
-				FROM card_apn_profiles_v17`,
-			`DROP TABLE card_apn_profiles_v17`,
-			`DROP TABLE card_policies_v17`,
-			`ALTER TABLE card_apn_profiles_new RENAME TO card_apn_profiles`,
-			`CREATE INDEX card_apn_profiles_iccid_idx ON card_apn_profiles(iccid, id)`,
-		}
-	case 19:
-		// Compatibility columns written by the Qualcomm/IMS development build.
-		// The stable server may leave them unused, but retaining them makes a
-		// database created by that build safely readable after an upgrade.
-		return []string{
-			`ALTER TABLE devices ADD COLUMN ims_apn TEXT NOT NULL DEFAULT 'ims'`,
-			`ALTER TABLE devices ADD COLUMN ims_private_identity TEXT NOT NULL DEFAULT ''`,
-			`ALTER TABLE devices ADD COLUMN ims_public_identity TEXT NOT NULL DEFAULT ''`,
-			`ALTER TABLE devices ADD COLUMN ims_sms_center TEXT NOT NULL DEFAULT ''`,
-			`ALTER TABLE devices ADD COLUMN ims_transport TEXT NOT NULL DEFAULT 'tcp'`,
-			`ALTER TABLE devices ADD COLUMN ims_allow_imsi_derived_identity INTEGER NOT NULL DEFAULT 1 CHECK (ims_allow_imsi_derived_identity IN (0, 1))`,
-			`ALTER TABLE devices ADD COLUMN vowifi_eap_method TEXT NOT NULL DEFAULT 'aka'`,
-			`ALTER TABLE devices ADD COLUMN vowifi_allow_sha1 INTEGER NOT NULL DEFAULT 0 CHECK (vowifi_allow_sha1 IN (0, 1))`,
-			`ALTER TABLE devices ADD COLUMN vowifi_use_modp1024 INTEGER NOT NULL DEFAULT 0 CHECK (vowifi_use_modp1024 IN (0, 1))`,
-		}
 	default:
 		return nil
 	}

internal/store/store.go

@@ -13,7 +13,7 @@ import (
 	_ "modernc.org/sqlite"
 )
 
-const schemaVersion = 19
+const schemaVersion = 16
 
 var ErrNotFound = errors.New("store: not found")
 
@@ -123,8 +123,7 @@ func migrate(ctx context.Context, db *sql.DB) error {
 				duplicateAdditiveColumn := (nextVersion == 7 && strings.Contains(statement, "ADD COLUMN modem_imei")) ||
 					(nextVersion == 8 && strings.Contains(statement, "ADD COLUMN device_type")) ||
 					(nextVersion == 14 && strings.Contains(statement, "ADD COLUMN")) ||
-					(nextVersion == 16 && strings.Contains(statement, "ADD COLUMN sim_pin")) ||
-					(nextVersion == 19 && strings.Contains(statement, "ADD COLUMN"))
+					(nextVersion == 16 && strings.Contains(statement, "ADD COLUMN sim_pin"))
 				if duplicateAdditiveColumn && strings.Contains(strings.ToLower(err.Error()), "duplicate column name") {
 					continue
 				}

internal/update/asset_test.go

@@ -1,12 +1,6 @@
 package update
 
 import (
-	"bytes"
-	"context"
-	"io"
-	"log/slog"
-	"net/http"
-	"net/http/httptest"
 	"reflect"
 	"testing"
 )
@@ -28,26 +22,3 @@ func TestAssetNamesFor(t *testing.T) {
 		}
 	}
 }
-
-func TestDownloadAssetWithProgressVerifiesPublishedSize(t *testing.T) {
-	payload := bytes.Repeat([]byte("vocat"), 4096)
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		_, _ = w.Write(payload)
-	}))
-	defer server.Close()
-	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
-
-	var destination bytes.Buffer
-	asset := &Asset{Name: "vocat-test", BrowserDownloadURL: server.URL, Size: int64(len(payload))}
-	if err := downloadAssetWithProgress(context.Background(), logger, asset, "", &destination); err != nil {
-		t.Fatal(err)
-	}
-	if !bytes.Equal(destination.Bytes(), payload) {
-		t.Fatal("downloaded asset content differs")
-	}
-
-	asset.Size++
-	if err := downloadAssetWithProgress(context.Background(), logger, asset, "", io.Discard); err == nil {
-		t.Fatal("download with a mismatched published size succeeded")
-	}
-}

internal/update/github.go

@@ -2,14 +2,11 @@ package update
 
 import (
 	"context"
-	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"io"
-	"net"
 	"net/http"
 	"strings"
-	"time"
 )
 
 // Release mirrors the subset of the GitHub releases API response that the
@@ -43,23 +40,6 @@ const (
 	DefaultRepository = "MengMengCode/VoCat"
 )
 
-var githubHTTPClient = &http.Client{
-	Transport: &http.Transport{
-		Proxy: http.ProxyFromEnvironment,
-		DialContext: (&net.Dialer{
-			Timeout:   10 * time.Second,
-			KeepAlive: 30 * time.Second,
-		}).DialContext,
-		ForceAttemptHTTP2:     true,
-		TLSHandshakeTimeout:   15 * time.Second,
-		ResponseHeaderTimeout: 20 * time.Second,
-		ExpectContinueTimeout: time.Second,
-		TLSClientConfig: &tls.Config{
-			MinVersion: tls.VersionTLS12,
-		},
-	},
-}
-
 // LatestRelease fetches the newest published release for repo (form
 // "owner/name"). A non-empty token is sent as a Bearer header, which is
 // required for private repositories and lifts the unauthenticated rate limit.
@@ -81,7 +61,7 @@ func LatestRelease(ctx context.Context, repo, token string) (*Release, error) {
 		req.Header.Set("Authorization", "Bearer "+token)
 	}
 
-	resp, err := githubHTTPClient.Do(req)
+	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return nil, fmt.Errorf("update: fetch latest release: %w", err)
 	}
@@ -140,7 +120,7 @@ func downloadAsset(ctx context.Context, url, token string, dst io.Writer) error
 	if token != "" {
 		req.Header.Set("Authorization", "Bearer "+token)
 	}
-	resp, err := githubHTTPClient.Do(req)
+	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return fmt.Errorf("update: download asset: %w", err)
 	}

internal/update/update.go

@@ -15,14 +15,12 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io"
 	"log/slog"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"
-	"sync/atomic"
 	"time"
 
 	"vocat/internal/buildinfo"
@@ -151,7 +149,7 @@ func applyUpdate(ctx context.Context, logger *slog.Logger, opts Options, release
 	}()
 
 	logger.Info("downloading binary", "asset", asset.Name, "size", asset.Size, "url", asset.BrowserDownloadURL)
-	if err := downloadAssetWithProgress(ctx, logger, asset, opts.Token, tmp); err != nil {
+	if err := downloadAsset(ctx, asset.BrowserDownloadURL, opts.Token, tmp); err != nil {
 		cleanup()
 		return err
 	}
@@ -208,68 +206,6 @@ func applyUpdate(ctx context.Context, logger *slog.Logger, opts Options, release
 	return nil
 }
 
-type downloadProgressWriter struct {
-	destination io.Writer
-	downloaded  atomic.Int64
-}
-
-func (writer *downloadProgressWriter) Write(data []byte) (int, error) {
-	written, err := writer.destination.Write(data)
-	writer.downloaded.Add(int64(written))
-	return written, err
-}
-
-func downloadAssetWithProgress(
-	ctx context.Context,
-	logger *slog.Logger,
-	asset *Asset,
-	token string,
-	destination io.Writer,
-) error {
-	progress := &downloadProgressWriter{destination: destination}
-	done := make(chan struct{})
-	go func() {
-		ticker := time.NewTicker(5 * time.Second)
-		defer ticker.Stop()
-		for {
-			select {
-			case <-done:
-				return
-			case <-ctx.Done():
-				return
-			case <-ticker.C:
-				downloaded := progress.downloaded.Load()
-				percent := float64(0)
-				if asset.Size > 0 {
-					percent = float64(downloaded) * 100 / float64(asset.Size)
-				}
-				logger.Info(
-					"download progress",
-					"asset", asset.Name,
-					"downloaded", downloaded,
-					"total", asset.Size,
-					"percent", fmt.Sprintf("%.1f", percent),
-				)
-			}
-		}
-	}()
-	err := downloadAsset(ctx, asset.BrowserDownloadURL, token, progress)
-	close(done)
-	if err != nil {
-		return err
-	}
-	if asset.Size > 0 && progress.downloaded.Load() != asset.Size {
-		return fmt.Errorf(
-			"update: asset size mismatch for %s: downloaded %d bytes, expected %d",
-			asset.Name,
-			progress.downloaded.Load(),
-			asset.Size,
-		)
-	}
-	logger.Info("download completed", "asset", asset.Name, "bytes", progress.downloaded.Load())
-	return nil
-}
-
 // validateExecutable catches incompatible architectures and missing dynamic
 // loaders before the working installation is touched. A valid checksum alone
 // cannot detect those packaging errors.

internal/vowifi/carrier_compat.go

@@ -1,60 +0,0 @@
-package vowifi
-
-import (
-	"fmt"
-	"strings"
-)
-
-const att310280EPDG = "epdg.epc.att.net"
-
-// AssignedRoutePLMN returns a narrowly matched ePDG route PLMN without
-// changing the subscription PLMN used for AKA identities. Some multi-profile
-// and MVNO SIMs authenticate against their own HPLMN but use a host network's
-// VoWiFi access gateway.
-func AssignedRoutePLMN(iccid, imsi string) (string, string, bool) {
-	iccid = strings.TrimSpace(iccid)
-	imsi = strings.TrimSpace(imsi)
-	switch {
-	case strings.HasPrefix(iccid, "894416") && strings.HasPrefix(imsi, "204047"):
-		// XeSIM/Lebara: keep 204/04 for AKA and use Vodafone UK's ePDG.
-		return "234", "15", true
-	case strings.HasPrefix(iccid, "894430") && strings.HasPrefix(imsi, "23433"):
-		// CTExcel UK: keep 234/33 for AKA and use the EE UK ePDG used by
-		// the initial VoWiFi provisioning path.
-		return "234", "30", true
-	default:
-		return "", "", false
-	}
-}
-
-// IsATT310280 reports whether the live subscription is on AT&T's three-digit
-// 310/280 PLMN. It is shared by SWu and IMS so the carrier exception cannot
-// drift between protocol layers.
-func IsATT310280(identity SIMIdentity) bool {
-	mcc := strings.TrimSpace(identity.HomeMCC)
-	mnc := strings.TrimLeft(strings.TrimSpace(identity.HomeMNC), "0")
-	imsi := strings.TrimSpace(identity.IMSI)
-	return mcc == "310" && mnc == "280" && strings.HasPrefix(imsi, "310280")
-}
-
-func applyAssignedCarrierRoute(identity SIMIdentity) SIMIdentity {
-	if strings.TrimSpace(identity.EPDG) != "" {
-		return identity
-	}
-	if routeMCC, routeMNC, ok := AssignedRoutePLMN(identity.ICCID, identity.IMSI); ok {
-		identity.EPDG = standardEPDGHostname(routeMCC, routeMNC)
-	}
-	return identity
-}
-
-func standardEPDGHostname(mcc, mnc string) string {
-	mnc = strings.TrimSpace(mnc)
-	for len(mnc) < 3 {
-		mnc = "0" + mnc
-	}
-	return fmt.Sprintf(
-		"epdg.epc.mnc%s.mcc%s.pub.3gppnetwork.org",
-		mnc,
-		strings.TrimSpace(mcc),
-	)
-}

internal/vowifi/carrier_compat_test.go

@@ -1,56 +0,0 @@
-package vowifi
-
-import "testing"
-
-func TestAssignedRoutePLMNUsesNarrowCardAndSubscriptionMatches(t *testing.T) {
-	tests := []struct {
-		name         string
-		iccid        string
-		imsi         string
-		wantMCC      string
-		wantMNC      string
-		wantAssigned bool
-	}{
-		{name: "XeSIM Lebara route", iccid: "8944160000000000001", imsi: "204047000000001", wantMCC: "234", wantMNC: "15", wantAssigned: true},
-		{name: "CTExcel initial route", iccid: "8944300000000000001", imsi: "234336000000001", wantMCC: "234", wantMNC: "30", wantAssigned: true},
-		{name: "XeSIM ICCID without matching subscription", iccid: "8944160000000000001", imsi: "204041000000001"},
-		{name: "similar ICCID must not match", iccid: "8944100000000000001", imsi: "204047000000001"},
-		{name: "generic EE SIM must not match CTExcel", iccid: "8944110000000000000", imsi: "234336000000001"},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			mcc, mnc, assigned := AssignedRoutePLMN(test.iccid, test.imsi)
-			if mcc != test.wantMCC || mnc != test.wantMNC || assigned != test.wantAssigned {
-				t.Fatalf("AssignedRoutePLMN() = %q/%q,%v, want %q/%q,%v", mcc, mnc, assigned, test.wantMCC, test.wantMNC, test.wantAssigned)
-			}
-		})
-	}
-}
-
-func TestApplyAssignedCarrierRoutePreservesAuthenticationPLMN(t *testing.T) {
-	identity := applyAssignedCarrierRoute(SIMIdentity{
-		ICCID: "8944300000000000001", IMSI: "234336000000001",
-		HomeMCC: "234", HomeMNC: "33",
-	})
-	if identity.HomeMCC != "234" || identity.HomeMNC != "33" {
-		t.Fatalf("authentication PLMN = %s/%s, want 234/33", identity.HomeMCC, identity.HomeMNC)
-	}
-	if identity.EPDG != "epdg.epc.mnc030.mcc234.pub.3gppnetwork.org" {
-		t.Fatalf("route ePDG = %q", identity.EPDG)
-	}
-}
-
-func TestIsATT310280RequiresMatchingPLMNAndIMSI(t *testing.T) {
-	if !IsATT310280(SIMIdentity{IMSI: "310280000000001", HomeMCC: "310", HomeMNC: "280"}) {
-		t.Fatal("AT&T 310/280 identity was not recognized")
-	}
-	for _, identity := range []SIMIdentity{
-		{IMSI: "310410000000001", HomeMCC: "310", HomeMNC: "280"},
-		{IMSI: "310280000000001", HomeMCC: "310", HomeMNC: "28"},
-		{IMSI: "310280000000001", HomeMCC: "311", HomeMNC: "280"},
-	} {
-		if IsATT310280(identity) {
-			t.Fatalf("unrelated identity matched AT&T 310/280: %#v", identity)
-		}
-	}
-}

internal/vowifi/ec20_adapter.go

@@ -97,10 +97,9 @@ type ec20RadioCheckpoint struct {
 }
 
 var (
-	_ SIMIdentityReader    = (*EC20Adapter)(nil)
-	_ AKAProvider          = (*EC20Adapter)(nil)
-	_ PreferredAKAProvider = (*EC20Adapter)(nil)
-	_ RadioController      = (*EC20Adapter)(nil)
+	_ SIMIdentityReader = (*EC20Adapter)(nil)
+	_ AKAProvider       = (*EC20Adapter)(nil)
+	_ RadioController   = (*EC20Adapter)(nil)
 )
 
 func NewEC20Adapter(
@@ -173,7 +172,6 @@ func (adapter *EC20Adapter) ReadIdentity(
 		HomeMCC: homeMCC,
 		HomeMNC: homeMNC,
 	}
-	identity = applyAssignedCarrierRoute(identity)
 	adapter.mu.Lock()
 	adapter.bindings[iccid] = ec20SIMBinding{
 		deviceID: deviceID,
@@ -210,11 +208,6 @@ func (adapter *EC20Adapter) readHomePLMN(
 	iccid string,
 	imsi string,
 ) (string, string, error) {
-	// AT&T 310/280 is a three-digit MNC. Prefer the assigned subscription
-	// prefix when EF_AD is stale or ambiguous after a profile switch.
-	if strings.HasPrefix(strings.TrimSpace(imsi), "310280") {
-		return "310", "280", nil
-	}
 	mncLength, efErr := adapter.readExplicitMNCLength(ctx, deviceID)
 	if efErr == nil {
 		if len(imsi) < 3+mncLength {
@@ -245,10 +238,9 @@ func assignedHomePLMN(imsi string) (mcc, mnc string, ok bool) {
 		prefix    string
 		mncLength int
 	}{
-		{prefix: "20404", mncLength: 2},  // Vodafone NL core; some Lebara subscriptions.
-		{prefix: "23415", mncLength: 2},  // Vodafone UK.
-		{prefix: "23487", mncLength: 2},  // Lebara Mobile UK.
-		{prefix: "310280", mncLength: 3}, // AT&T / RedPocket GSMA.
+		{prefix: "20404", mncLength: 2}, // Vodafone NL core; some Lebara subscriptions.
+		{prefix: "23415", mncLength: 2}, // Vodafone UK.
+		{prefix: "23487", mncLength: 2}, // Lebara Mobile UK.
 	}
 	for _, assignment := range assignments {
 		if strings.HasPrefix(imsi, assignment.prefix) {
@@ -399,46 +391,11 @@ func (adapter *EC20Adapter) Authenticate(
 	ctx context.Context,
 	identity SIMIdentity,
 	challenge AKAChallenge,
-) (AKAResult, error) {
-	return adapter.authenticateWithApplication(ctx, identity, challenge, "")
-}
-
-func (adapter *EC20Adapter) AuthenticateWithPreference(
-	ctx context.Context,
-	identity SIMIdentity,
-	challenge AKAChallenge,
-	preference string,
-) (AKAResult, error) {
-	return adapter.authenticateWithApplication(ctx, identity, challenge, preference)
-}
-
-func (adapter *EC20Adapter) authenticateWithApplication(
-	ctx context.Context,
-	identity SIMIdentity,
-	challenge AKAChallenge,
-	preference string,
 ) (AKAResult, error) {
 	binding, err := adapter.bindingFor(identity)
 	if err != nil {
 		return AKAResult{}, err
 	}
-	if strings.EqualFold(strings.TrimSpace(preference), "isim_strict") && binding.application != "ISIM" {
-		aid, application, err := adapter.discoverPreferredAKAApplication(
-			ctx,
-			binding.deviceID,
-			isimAIDPrefix,
-			"ISIM",
-		)
-		if err != nil {
-			return AKAResult{}, err
-		}
-		binding.aid = aid
-		binding.application = application
-		binding.basicChannel = false
-		adapter.mu.Lock()
-		adapter.bindings[binding.iccid] = binding
-		adapter.mu.Unlock()
-	}
 	if binding.aid == "" {
 		if _, err := adapter.CheckReady(ctx, identity); err != nil {
 			return AKAResult{}, err
@@ -448,14 +405,6 @@ func (adapter *EC20Adapter) authenticateWithApplication(
 			return AKAResult{}, err
 		}
 	}
-	if strings.EqualFold(strings.TrimSpace(preference), "isim_strict") && binding.application != "ISIM" {
-		return AKAResult{}, fmt.Errorf(
-			"%w: ISIM strict requested, selected %s (%s)",
-			ErrEC20ApplicationAbsent,
-			binding.application,
-			binding.aid,
-		)
-	}
 	if err := adapter.verifyLiveICCID(ctx, binding); err != nil {
 		return AKAResult{}, err
 	}
@@ -958,28 +907,6 @@ func (adapter *EC20Adapter) discoverAKAApplication(
 	return usimAIDPrefix, "USIM", nil
 }
 
-func (adapter *EC20Adapter) discoverPreferredAKAApplication(
-	ctx context.Context,
-	deviceID string,
-	aidPrefix string,
-	application string,
-) (string, string, error) {
-	response, err := adapter.execute(ctx, deviceID, "AT+CUAD")
-	if err == nil {
-		data, parseErr := parseCUADData(response)
-		if parseErr == nil {
-			for _, candidate := range collectApplicationAIDs(data) {
-				if strings.HasPrefix(candidate, aidPrefix) {
-					return candidate, application, nil
-				}
-			}
-		}
-	}
-	// AT+CUAD is optional. Returning the standard AID prefix still lets CCHO
-	// perform the authoritative application probe on older EC20 firmware.
-	return aidPrefix, application, nil
-}
-
 func (adapter *EC20Adapter) openLogicalChannel(
 	ctx context.Context,
 	deviceID string,
@@ -1219,27 +1146,12 @@ func parseCRSMData(response modem.Response) ([]byte, error) {
 }
 
 func parseCUADData(response modem.Response) ([]byte, error) {
-	// EC20 firmware may split the BER-TLV stream across adjacent quoted chunks
-	// and continuation lines. Concatenating every hex fragment prevents an ISIM
-	// AID after a USIM entry from being silently discarded.
-	var encoded strings.Builder
-	collect := false
-	for _, line := range response.Lines {
-		line = strings.TrimSpace(line)
-		if strings.HasPrefix(strings.ToUpper(line), "+CUAD:") {
-			collect = true
-			line = strings.TrimSpace(line[len("+CUAD:"):])
-		} else if !collect {
-			continue
-		}
-		for _, fragment := range quotedHexFragments(line) {
-			encoded.WriteString(fragment)
-		}
-	}
-	if encoded.Len() == 0 {
+	fields := parseCSV(valueAfterATPrefix(response, "+CUAD:"))
+	if len(fields) == 0 {
 		return nil, errors.New("CUAD response has no data")
 	}
-	data, err := hex.DecodeString(encoded.String())
+	value := fields[len(fields)-1]
+	data, err := hex.DecodeString(strings.Trim(value, `"`))
 	if err != nil || len(data) == 0 {
 		return nil, errors.New("CUAD response data is invalid")
 	}
@@ -1249,48 +1161,11 @@ func parseCUADData(response modem.Response) ([]byte, error) {
 	return data, nil
 }
 
-func quotedHexFragments(line string) []string {
-	var fragments []string
-	for {
-		start := strings.IndexByte(line, '"')
-		if start < 0 {
-			break
-		}
-		line = line[start+1:]
-		end := strings.IndexByte(line, '"')
-		if end < 0 {
-			break
-		}
-		fragment := strings.ToUpper(strings.TrimSpace(line[:end]))
-		line = line[end+1:]
-		if fragment == "" || len(fragment)%2 != 0 {
-			continue
-		}
-		valid := true
-		for _, character := range fragment {
-			if (character < '0' || character > '9') && (character < 'A' || character > 'F') {
-				valid = false
-				break
-			}
-		}
-		if valid {
-			fragments = append(fragments, fragment)
-		}
-	}
-	return fragments
-}
-
 func collectApplicationAIDs(data []byte) []string {
 	var result []string
 	var walk func([]byte)
 	walk = func(value []byte) {
 		for len(value) > 0 {
-			for len(value) > 0 && value[0] == 0xff {
-				value = value[1:]
-			}
-			if len(value) == 0 {
-				return
-			}
 			tag, constructed, body, consumed, err := decodeBERTLV(value)
 			if err != nil || consumed == 0 {
 				return

internal/vowifi/ec20_adapter_test.go

@@ -6,7 +6,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"reflect"
 	"strings"
 	"sync"
 	"testing"
@@ -422,7 +421,6 @@ func TestAssignedHomePLMNIncludesLebaraUKCores(t *testing.T) {
 		"204040123456789": "204/04",
 		"234150123456789": "234/15",
 		"234870123456789": "234/87",
-		"310280000000001": "310/280",
 	}
 	for imsi, want := range tests {
 		mcc, mnc, ok := assignedHomePLMN(imsi)
@@ -432,23 +430,6 @@ func TestAssignedHomePLMNIncludesLebaraUKCores(t *testing.T) {
 	}
 }
 
-func TestEC20AdapterTreatsATT310280AsThreeDigitMNC(t *testing.T) {
-	t.Parallel()
-	transcript := &ec20Transcript{t: t, steps: identityTranscriptStepsWithoutEFAD("310280000000001")}
-	adapter, err := NewEC20Adapter(transcript, EC20AdapterOptions{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	identity, err := adapter.ReadIdentity(context.Background(), "ec20-1")
-	if err != nil {
-		t.Fatalf("ReadIdentity: %v", err)
-	}
-	if identity.HomeMCC != "310" || identity.HomeMNC != "280" {
-		t.Fatalf("home PLMN = %s/%s, want 310/280", identity.HomeMCC, identity.HomeMNC)
-	}
-	transcript.assertDone()
-}
-
 func TestEC20AdapterRadioTransactionRestoresCFUNAndPDPContexts(
 	t *testing.T,
 ) {
@@ -617,78 +598,3 @@ func synchronizationFailureUSIMResponse() []byte {
 	raw = append(raw, auts...)
 	return append(raw, 0x90, 0x00)
 }
-
-func TestCollectApplicationAIDsSkipsCUADPadding(t *testing.T) {
-	t.Parallel()
-	response := modem.Response{Lines: []string{
-		`+CUAD: "61184F10A0000000871002FFFFFFFF890302000050045553494DFFFFFFFFFFFFFFFFFFFFFFFF""61184F10A0000000871004FFFFFFFF890302000050044953494DFFFFFFFFFFFFFFFFFFFFFFFF"`,
-		`"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"`,
-	}}
-	data, err := parseCUADData(response)
-	if err != nil {
-		t.Fatal(err)
-	}
-	aids := collectApplicationAIDs(data)
-	want := []string{
-		"A0000000871002FFFFFFFF8903020000",
-		"A0000000871004FFFFFFFF8903020000",
-	}
-	if !reflect.DeepEqual(aids, want) {
-		t.Fatalf("AIDs = %v, want %v", aids, want)
-	}
-}
-
-func TestEC20AdapterISIMStrictUsesCUADFullAID(t *testing.T) {
-	var challenge AKAChallenge
-	for index := range challenge.RAND {
-		challenge.RAND[index] = byte(index)
-		challenge.AUTN[index] = byte(0xf0 + index)
-	}
-	authAPDU := buildUSIMAuthenticateAPDU(challenge)
-	authCommand := fmt.Sprintf(
-		`AT+CGLA=1,%d,"%s"`,
-		len(authAPDU)*2,
-		strings.ToUpper(hex.EncodeToString(authAPDU)),
-	)
-	encodedResponse := strings.ToUpper(hex.EncodeToString(successfulUSIMResponse()))
-	fullISIM := "A0000000871004FFFFFFFF8903020000"
-	cuad := `61184F10A0000000871002FFFFFFFF890302000050045553494D61184F10A0000000871004FFFFFFFF890302000050044953494D`
-	transcript := &ec20Transcript{
-		t: t,
-		steps: []ec20TranscriptStep{
-			{command: "AT+CPIN?", lines: []string{"+CPIN: READY"}},
-			{command: "AT+CIMI", lines: []string{"310280000000001"}},
-			{command: "AT+CCID", lines: []string{"+CCID: 8901000000000000001"}},
-			{command: "AT+CGSN", lines: []string{"860000000000001"}},
-			{command: "AT+CUAD", lines: []string{`+CUAD: "` + cuad + `"`}},
-			{command: "AT+CCID", lines: []string{"+CCID: 8901000000000000001"}},
-			{command: `AT+CCHO="` + fullISIM + `"`, lines: []string{"+CCHO: 1"}},
-			{
-				command:   authCommand,
-				sensitive: true,
-				lines: []string{fmt.Sprintf(
-					`+CGLA: %d,"%s"`,
-					len(encodedResponse),
-					encodedResponse,
-				)},
-			},
-			{command: "AT+CCHC=1"},
-		},
-	}
-	adapter, err := NewEC20Adapter(transcript, EC20AdapterOptions{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	identity, err := adapter.ReadIdentity(context.Background(), "ec20-1")
-	if err != nil {
-		t.Fatalf("ReadIdentity: %v", err)
-	}
-	result, err := adapter.AuthenticateWithPreference(context.Background(), identity, challenge, "isim_strict")
-	if err != nil {
-		t.Fatalf("AuthenticateWithPreference: %v", err)
-	}
-	if !bytes.Equal(result.RES, []byte{1, 2, 3, 4, 5, 6, 7, 8}) {
-		t.Fatalf("RES = %x", result.RES)
-	}
-	transcript.assertDone()
-}

internal/vowifi/ike/child.go

@@ -16,7 +16,6 @@ const (
 
 	configInternalIPv4Address = 1
 	configInternalIPv4DNS     = 3
-	configApplicationVersion  = 7
 	configInternalIPv6Address = 8
 	configInternalIPv6DNS     = 10
 	configPCSCFIPv4Address    = 20
@@ -187,9 +186,6 @@ func configurationRequest() payload {
 		configInternalIPv6DNS,
 		configPCSCFIPv4Address,
 		configPCSCFIPv6Address,
-		// Android's IKE library always appends APPLICATION_VERSION to the
-		// initial configuration request, even when the value is empty.
-		configApplicationVersion,
 	}
 	body := []byte{configRequest, 0, 0, 0}
 	for _, attribute := range attributes {

internal/vowifi/ike/eap.go

@@ -285,7 +285,6 @@ type akaClient struct {
 	simIdentity       vowifi.SIMIdentity
 	provider          vowifi.AKAProvider
 	keys              akaKeys
-	lastResponseStage string
 	challengeComplete bool
 	resultIndication  bool
 	protectedSuccess  bool
@@ -299,12 +298,7 @@ func newAKAClient(identity vowifi.SIMIdentity, provider vowifi.AKAProvider) (*ak
 	if err != nil {
 		return nil, err
 	}
-	return &akaClient{
-		identity:          nai,
-		simIdentity:       identity,
-		provider:          provider,
-		lastResponseStage: "in the initial IKE_AUTH identity exchange",
-	}, nil
+	return &akaClient{identity: nai, simIdentity: identity, provider: provider}, nil
 }
 
 func (client *akaClient) handle(ctx context.Context, encoded []byte) (eapAction, error) {
@@ -314,9 +308,9 @@ func (client *akaClient) handle(ctx context.Context, encoded []byte) (eapAction,
 	}
 	switch packet.Code {
 	case eapFailure:
-		stage := client.lastResponseStage
+		stage := "before the SIM AKA challenge (identity or subscription rejected)"
 		if client.challengeComplete {
-			stage = "after the SIM AKA challenge response"
+			stage = "after the SIM AKA response (AKA result or subscription rejected)"
 		}
 		return eapAction{}, fmt.Errorf("%w %s", vowifi.ErrEAPAuthenticationRejected, stage)
 	case eapSuccess:
@@ -339,7 +333,6 @@ func (client *akaClient) handle(ctx context.Context, encoded []byte) (eapAction,
 			Type:       eapTypeIdentity,
 			Data:       client.identity,
 		})
-		client.lastResponseStage = "after EAP-Response/Identity"
 		return eapAction{Response: response}, err
 	case eapTypeAKA:
 		return client.handleAKARequest(ctx, packet)
@@ -412,7 +405,6 @@ func (client *akaClient) respondAKAIdentity(identifier uint8, attributes []akaAt
 		Type:       eapTypeAKA,
 		Data:       data,
 	})
-	client.lastResponseStage = "after EAP-Response/AKA-Identity"
 	return eapAction{Response: response}, err
 }
 

internal/vowifi/ike/eap_test.go

@@ -106,34 +106,16 @@ func TestEAPFailureReportsAuthenticationStage(t *testing.T) {
 		t.Fatal(err)
 	}
 	_, err = client.handle(context.Background(), failure)
-	if !errors.Is(err, vowifi.ErrEAPAuthenticationRejected) || !strings.Contains(err.Error(), "initial IKE_AUTH identity exchange") {
+	if !errors.Is(err, vowifi.ErrEAPAuthenticationRejected) || !strings.Contains(err.Error(), "before the SIM AKA challenge") {
 		t.Fatalf("pre-challenge failure = %v", err)
 	}
 	client.challengeComplete = true
 	_, err = client.handle(context.Background(), failure)
-	if !errors.Is(err, vowifi.ErrEAPAuthenticationRejected) || !strings.Contains(err.Error(), "after the SIM AKA challenge response") {
+	if !errors.Is(err, vowifi.ErrEAPAuthenticationRejected) || !strings.Contains(err.Error(), "after the SIM AKA response") {
 		t.Fatalf("post-challenge failure = %v", err)
 	}
 }
 
-func TestEAPFailureReportsIdentityResponseStage(t *testing.T) {
-	client, err := newAKAClient(testSIMIdentity(), &testAKAProvider{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	identityRequest, _ := marshalEAPPacket(eapPacket{
-		Code: eapRequest, Identifier: 4, Type: eapTypeIdentity,
-	})
-	if _, err := client.handle(context.Background(), identityRequest); err != nil {
-		t.Fatal(err)
-	}
-	failure, _ := marshalEAPPacket(eapPacket{Code: eapFailure, Identifier: 5})
-	_, err = client.handle(context.Background(), failure)
-	if !errors.Is(err, vowifi.ErrEAPAuthenticationRejected) || !strings.Contains(err.Error(), "after EAP-Response/Identity") {
-		t.Fatalf("identity-stage failure = %v", err)
-	}
-}
-
 func TestEAPAKAChallengeTypedSIMAndMAC(t *testing.T) {
 	result := vowifi.AKAResult{
 		RES: bytes.Repeat([]byte{0x91}, 8),

internal/vowifi/ike/ike3gpp.go

@@ -1,57 +0,0 @@
-package ike
-
-import (
-	"encoding/binary"
-	"errors"
-	"strings"
-)
-
-// deviceIdentityRequested reports the 3GPP DEVICE_IDENTITY request defined by
-// TS 24.302. Android remembers this request and answers it in a later EAP
-// IKE_AUTH request, but only after authenticating the ePDG.
-func deviceIdentityRequested(payloads []payload) (bool, error) {
-	for _, item := range payloadsOfType(payloads, payloadNotify) {
-		kind, _, err := parseNotify(item)
-		if err != nil {
-			return false, err
-		}
-		if kind == notifyDeviceIdentity {
-			return true, nil
-		}
-	}
-	return false, nil
-}
-
-func deviceIdentityNotify(identity string) (payload, error) {
-	identity = strings.TrimSpace(identity)
-	if (len(identity) != 15 && len(identity) != 16) || !decimalDigits(identity) {
-		return payload{}, errors.New("ike: device identity must contain 15 or 16 digits")
-	}
-	identityType := byte(1) // IMEI
-	if len(identity) == 16 {
-		identityType = 2 // IMEISV
-	}
-	data := make([]byte, 11)
-	// TS 24.302 Figure 8.2.9.2: this inner length excludes its own two
-	// octets, and is therefore 9 for an IMEI/IMEISV value.
-	binary.BigEndian.PutUint16(data[:2], 9)
-	data[2] = identityType
-	for index := 0; index < 8; index++ {
-		low := identity[index*2] - '0'
-		high := byte(0x0f)
-		if index*2+1 < len(identity) {
-			high = identity[index*2+1] - '0'
-		}
-		data[index+3] = high<<4 | low
-	}
-	return makeNotify(notifyDeviceIdentity, data), nil
-}
-
-func decimalDigits(value string) bool {
-	for _, digit := range value {
-		if digit < '0' || digit > '9' {
-			return false
-		}
-	}
-	return value != ""
-}

internal/vowifi/ike/ike3gpp_test.go

@@ -1,39 +0,0 @@
-package ike
-
-import (
-	"bytes"
-	"testing"
-)
-
-func TestDeviceIdentityNotifyMatchesAndroidEncoding(t *testing.T) {
-	item, err := deviceIdentityNotify("123456789012345")
-	if err != nil {
-		t.Fatal(err)
-	}
-	kind, data, err := parseNotify(item)
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := []byte{0, 9, 1, 0x21, 0x43, 0x65, 0x87, 0x09, 0x21, 0x43, 0xf5}
-	if kind != notifyDeviceIdentity || !bytes.Equal(data, want) {
-		t.Fatalf("DEVICE_IDENTITY = %d/%x, want %d/%x", kind, data, notifyDeviceIdentity, want)
-	}
-}
-
-func TestDeviceIdentityNotifyAcceptsIMEISV(t *testing.T) {
-	item, err := deviceIdentityNotify("1234567890123456")
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, data, _ := parseNotify(item)
-	if data[2] != 2 || data[10] != 0x65 {
-		t.Fatalf("IMEISV data = %x", data)
-	}
-}
-
-func TestDeviceIdentityRequested(t *testing.T) {
-	requested, err := deviceIdentityRequested([]payload{makeNotify(notifyDeviceIdentity, nil)})
-	if err != nil || !requested {
-		t.Fatalf("deviceIdentityRequested() = %v, %v", requested, err)
-	}
-}

internal/vowifi/ike/provider.go

@@ -111,7 +111,6 @@ func (provider *Provider) Start(ctx context.Context, request vowifi.TunnelReques
 
 	group := uint16(dhMODP2048)
 	legacyFirst := legacyIKEProfile(request.Identity.HomeMCC, request.Identity.HomeMNC)
-	advertiseEAPOnly := advertiseEAPOnlyAuthentication(request.Identity.HomeMCC, request.Identity.HomeMNC)
 	if legacyFirst {
 		group = dhMODP1024
 	}
@@ -246,23 +245,6 @@ func (provider *Provider) Start(ctx context.Context, request vowifi.TunnelReques
 			return nil, err
 		}
 	}
-	cleanupPendingIKE := true
-	cleanupMessageID := uint32(2)
-	defer func() {
-		if cleanupPendingIKE {
-			cleanupContext, cancel := context.WithTimeout(context.Background(), time.Second)
-			defer cancel()
-			_ = sendIKESADelete(
-				cleanupContext,
-				transport,
-				ikeSuite,
-				keys,
-				initiatorSPI,
-				responseHeader.ResponderSPI,
-				cleanupMessageID,
-			)
-		}
-	}()
 
 	var childInboundSPIBytes [4]byte
 	if err := fillNonzero(provider.config.Random, childInboundSPIBytes[:]); err != nil {
@@ -277,7 +259,7 @@ func (provider *Provider) Start(ctx context.Context, request vowifi.TunnelReques
 	requestedIDr := payload{Type: payloadIDr, Body: append([]byte{2, 0, 0, 0}, []byte(provider.config.APN)...)}
 	tsi := dualStackTrafficSelectors(payloadTSi)
 	tsr := dualStackTrafficSelectors(payloadTSr)
-	firstAuthPayloads := buildInitialEAPAuth(idi, requestedIDr, childOfferBody, tsi, tsr, advertiseEAPOnly)
+	firstAuthPayloads := buildInitialEAPOnlyAuth(idi, requestedIDr, childOfferBody, tsi, tsr)
 	authHeader := ikeHeader{
 		InitiatorSPI: initiatorSPI,
 		ResponderSPI: responseHeader.ResponderSPI,
@@ -310,19 +292,15 @@ func (provider *Provider) Start(ctx context.Context, request vowifi.TunnelReques
 		initiatorNonce,
 		ikeSuite,
 		keys.SKpr,
-		"", // Android Iwlan enables IKE_OPTION_ACCEPT_ANY_REMOTE_ID.
+		serverName,
 		serverName,
 		provider.config.RootCAs,
 		provider.config.ResponderPublicKey,
-		true, // Some ePDGs, including O2 Germany, implicitly defer AUTH without accepting the RFC 5998 notify.
+		true, // RFC 5998 EAP-only authentication defers responder AUTH.
 	)
 	if err != nil {
 		return nil, err
 	}
-	deviceIdentityPending, err := deviceIdentityRequested(authResponsePayloads)
-	if err != nil {
-		return nil, err
-	}
 	messageID := uint32(1)
 	currentPayloads := authResponsePayloads
 	for round := 0; round < 10; round++ {
@@ -341,29 +319,16 @@ func (provider *Provider) Start(ctx context.Context, request vowifi.TunnelReques
 			return nil, errors.New("ike: EAP state machine produced no response")
 		}
 		messageID++
-		cleanupMessageID = messageID + 1
-		requestPayloads := []payload{{Type: payloadEAP, Body: action.Response}}
-		if deviceIdentityPending && responderAUTH == vowifi.ResponderAUTHVerified {
-			deviceIdentity, identityErr := deviceIdentityNotify(request.Identity.IMEI)
-			if identityErr == nil {
-				requestPayloads = append(requestPayloads, deviceIdentity)
-			}
-		}
 		eapRequest, err := encryptPayloads(ikeHeader{
 			InitiatorSPI: initiatorSPI,
 			ResponderSPI: responseHeader.ResponderSPI,
 			Exchange:     exchangeIKEAuth,
 			Flags:        flagInitiator,
 			MessageID:    messageID,
-		}, requestPayloads, ikeSuite, keys.SKei, keys.SKai, provider.config.Random)
+		}, []payload{{Type: payloadEAP, Body: action.Response}}, ikeSuite, keys.SKei, keys.SKai, provider.config.Random)
 		if err != nil {
 			return nil, err
 		}
-		if requested, notifyErr := deviceIdentityRequested(currentPayloads); notifyErr != nil {
-			return nil, notifyErr
-		} else if requested {
-			deviceIdentityPending = true
-		}
 		eapResponse, err := transport.RoundTrip(ctx, eapRequest)
 		if err != nil {
 			return nil, err
@@ -393,7 +358,6 @@ func (provider *Provider) Start(ctx context.Context, request vowifi.TunnelReques
 		return nil, err
 	}
 	messageID++
-	cleanupMessageID = messageID + 1
 	finalRequest, err := encryptPayloads(ikeHeader{
 		InitiatorSPI: initiatorSPI,
 		ResponderSPI: responseHeader.ResponderSPI,
@@ -419,17 +383,17 @@ func (provider *Provider) Start(ctx context.Context, request vowifi.TunnelReques
 	}
 	finalAUTHs := payloadsOfType(finalPayloads, payloadAuth)
 	if len(finalAUTHs) != 1 {
-		return nil, fmt.Errorf("%w: final EAP response must contain exactly one MSK AUTH payload", vowifi.ErrResponderAUTHRequired)
+		return nil, fmt.Errorf("%w: final EAP-only response must contain exactly one MSK AUTH payload", vowifi.ErrResponderAUTHRequired)
 	}
 	if len(responderID.Body) == 0 {
-		return nil, errors.New("ike: EAP exchange has no responder IDr for the AUTH transcript")
+		return nil, errors.New("ike: EAP-only exchange has no initial ePDG IDr for the responder AUTH transcript")
 	}
 	finalIDs := payloadsOfType(finalPayloads, payloadIDr)
 	if len(finalIDs) > 1 {
 		return nil, errors.New("ike: duplicate final responder IDr payload")
 	}
 	if len(finalIDs) == 1 {
-		if err := validateFQDNIDr(finalIDs[0], "", "final responder"); err != nil {
+		if err := validateFQDNIDr(finalIDs[0], provider.config.APN, "final APN"); err != nil {
 			return nil, fmt.Errorf("ike: final APN IDr: %w", err)
 		}
 	}
@@ -508,11 +472,9 @@ func (provider *Provider) Start(ctx context.Context, request vowifi.TunnelReques
 		keys,
 		initiatorSPI,
 		responseHeader.ResponderSPI,
-		messageID+1,
 		natDetected,
 		provider.config.KeepaliveInterval,
 	)
-	cleanupPendingIKE = false
 	installed, err := provider.config.Installer.Install(ctx, ChildSAConfig{
 		Name:               name,
 		OuterLocal:         append(net.IP(nil), transport.LocalAddr().IP...),
@@ -537,11 +499,11 @@ func (provider *Provider) Start(ctx context.Context, request vowifi.TunnelReques
 		Relay:              relay,
 	})
 	if err != nil {
-		_ = relay.CloseWithDelete(ctx)
+		_ = relay.Close()
 		return nil, fmt.Errorf("ike: install CHILD_SA: %w", err)
 	}
 	if installed == nil {
-		_ = relay.CloseWithDelete(ctx)
+		_ = relay.Close()
 		return nil, errors.New("ike: CHILD_SA installer returned a nil handle")
 	}
 	dataplaneMode := "unknown"
@@ -591,47 +553,6 @@ func legacyIKEProfile(mcc, mnc string) bool {
 	return plmn == "23415" || plmn == "2044"
 }
 
-func advertiseEAPOnlyAuthentication(mcc, mnc string) bool {
-	// Android exposes the ePDG authentication method as carrier policy rather
-	// than unconditionally requesting RFC 5998 EAP-only authentication. O2
-	// Germany's 262-03 ePDG rejects an initial IKE_AUTH that explicitly carries
-	// EAP_ONLY_AUTHENTICATION, but then implicitly defers responder AUTH when the
-	// notify is omitted. Do not advertise RFC 5998 for that PLMN; the final
-	// responder AUTH derived from the EAP-AKA MSK remains mandatory.
-	return !o2GermanyIKECompatibility(mcc, mnc)
-}
-
-func o2GermanyIKECompatibility(mcc, mnc string) bool {
-	plmn := strings.TrimSpace(mcc) + strings.TrimLeft(strings.TrimSpace(mnc), "0")
-	return plmn == "2623"
-}
-
-func buildInitialEAPAuth(
-	idi payload,
-	requestedIDr payload,
-	childOfferBody []byte,
-	tsi payload,
-	tsr payload,
-	eapOnly bool,
-) []payload {
-	// Match Android's IkeSessionStateMachine.buildIkeAuthReq ordering. Some
-	// carrier ePDGs inspect this first encrypted exchange before starting EAP.
-	payloads := []payload{idi, requestedIDr}
-	if eapOnly {
-		payloads = append(payloads, makeNotify(notifyEAPOnlyAuth, nil))
-	}
-	payloads = append(payloads,
-		makeNotify(notifyMOBIKESupported, nil),
-		makeNotify(notifyInitialContact, nil),
-	)
-	return append(payloads,
-		payload{Type: payloadSA, Body: append([]byte(nil), childOfferBody...)},
-		tsi,
-		tsr,
-		configurationRequest(),
-	)
-}
-
 func buildInitialEAPOnlyAuth(
 	idi payload,
 	requestedIDr payload,
@@ -639,7 +560,15 @@ func buildInitialEAPOnlyAuth(
 	tsi payload,
 	tsr payload,
 ) []payload {
-	return buildInitialEAPAuth(idi, requestedIDr, childOfferBody, tsi, tsr, true)
+	return []payload{
+		idi,
+		requestedIDr,
+		makeNotify(notifyEAPOnlyAuth, nil),
+		{Type: payloadSA, Body: append([]byte(nil), childOfferBody...)},
+		tsi,
+		tsr,
+		configurationRequest(),
+	}
 }
 
 func ikeOffer(group uint16, legacyFirst bool) proposal {
@@ -948,7 +877,7 @@ func (session *Session) Close(ctx context.Context) error {
 		}
 	}
 	if relay != nil {
-		if err := relay.CloseWithDelete(ctx); err != nil {
+		if err := relay.Close(); err != nil {
 			errs = append(errs, fmt.Errorf("close session relay: %w", err))
 		}
 	}

internal/vowifi/ike/provider_test.go

@@ -42,17 +42,15 @@ func (reader constantReader) Read(destination []byte) (int, error) {
 }
 
 type firstAuthCaptureTransport struct {
-	t           *testing.T
-	wantEAPOnly bool
-	wantGroup   uint16
-	calls       int
-	suite       negotiatedSuite
-	keys        ikeKeys
-	spii        [8]byte
-	spir        [8]byte
-	nonceI      []byte
-	nonceR      []byte
-	floated     bool
+	t       *testing.T
+	calls   int
+	suite   negotiatedSuite
+	keys    ikeKeys
+	spii    [8]byte
+	spir    [8]byte
+	nonceI  []byte
+	nonceR  []byte
+	floated bool
 }
 
 func (transport *firstAuthCaptureTransport) LocalAddr() *net.UDPAddr {
@@ -98,16 +96,8 @@ func (transport *firstAuthCaptureTransport) answerIKEInit(packet []byte) ([]byte
 		return nil, err
 	}
 	group := uint16(ke.Body[0])<<8 | uint16(ke.Body[1])
-	wantGroup := transport.wantGroup
-	if wantGroup == 0 {
-		wantGroup = dhMODP1024
-	}
-	wantKELength := 128
-	if wantGroup == dhMODP2048 {
-		wantKELength = 256
-	}
-	if group != wantGroup || len(ke.Body[4:]) != wantKELength {
-		transport.t.Fatalf("init KE = group %d length %d, want group %d length %d", group, len(ke.Body[4:]), wantGroup, wantKELength)
+	if group != dhMODP1024 || len(ke.Body[4:]) != 128 {
+		transport.t.Fatalf("Vodafone init KE = group %d length %d", group, len(ke.Body[4:]))
 	}
 	serverDH, err := newDHExchange(group, constantReader{value: 0x77})
 	if err != nil {
@@ -118,15 +108,6 @@ func (transport *firstAuthCaptureTransport) answerIKEInit(packet []byte) ([]byte
 		return nil, err
 	}
 	transport.suite = legacyTestSuite()
-	if group == dhMODP2048 {
-		transport.suite = negotiatedSuite{
-			EncryptionID:   encryptionAESCBC,
-			EncryptionBits: 128,
-			PRFID:          prfHMACSHA256,
-			IntegrityID:    integrityHMACSHA256_128,
-			DHID:           dhMODP2048,
-		}
-	}
 	transport.spii = header.InitiatorSPI
 	transport.spir = [8]byte{0x80, 1, 2, 3, 4, 5, 6, 7}
 	transport.nonceI = append([]byte(nil), nonce.Body...)
@@ -147,9 +128,9 @@ func (transport *firstAuthCaptureTransport) answerIKEInit(packet []byte) ([]byte
 		Protocol: protocolIKE,
 		Transforms: []transform{
 			{Type: transformEncryption, ID: encryptionAESCBC, KeyLength: 128},
-			{Type: transformPRF, ID: transport.suite.PRFID},
-			{Type: transformIntegrity, ID: transport.suite.IntegrityID},
-			{Type: transformDH, ID: group},
+			{Type: transformPRF, ID: prfHMACSHA1},
+			{Type: transformIntegrity, ID: integrityHMACSHA1_96},
+			{Type: transformDH, ID: dhMODP1024},
 		},
 	}})
 	keBody := make([]byte, 4+len(serverDH.Public))
@@ -199,8 +180,8 @@ func (transport *firstAuthCaptureTransport) observeFirstAuth(packet []byte) erro
 			foundEAPOnly = true
 		}
 	}
-	if foundEAPOnly != transport.wantEAPOnly {
-		transport.t.Fatalf("first IKE_AUTH EAP_ONLY_AUTHENTICATION present=%v, want %v", foundEAPOnly, transport.wantEAPOnly)
+	if !foundEAPOnly {
+		transport.t.Fatal("first IKE_AUTH omitted EAP_ONLY_AUTHENTICATION")
 	}
 	for _, kind := range []uint8{payloadIDi, payloadSA, payloadTSi, payloadTSr, payloadCP} {
 		if _, err := onePayload(payloads, kind); err != nil {
@@ -231,7 +212,7 @@ func (unusedInstaller) Install(context.Context, ChildSAConfig) (ChildSAHandle, e
 }
 
 func TestProviderVodafoneFirstAuthIsEAPOnlyAndRequestsIMSAPN(t *testing.T) {
-	capture := &firstAuthCaptureTransport{t: t, wantEAPOnly: true}
+	capture := &firstAuthCaptureTransport{t: t}
 	provider, err := NewProvider(Config{
 		Random:    constantReader{value: 0x42},
 		Timeout:   time.Second,
@@ -269,44 +250,5 @@ func TestProviderVodafoneFirstAuthIsEAPOnlyAndRequestsIMSAPN(t *testing.T) {
 	}
 }
 
-func TestProviderO2GermanyFirstAuthUsesStandardEAPAndRequestsIMSAPN(t *testing.T) {
-	capture := &firstAuthCaptureTransport{t: t, wantEAPOnly: false, wantGroup: dhMODP2048}
-	provider, err := NewProvider(Config{
-		Random:    constantReader{value: 0x42},
-		Timeout:   time.Second,
-		Installer: unusedInstaller{},
-		APN:       "ims",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	provider.transportFactory = func(
-		context.Context,
-		transportConfig,
-		vowifi.ProxyRoute,
-		string,
-	) (datagramTransport, error) {
-		return capture, nil
-	}
-	aka := &testAKAProvider{}
-	_, err = provider.Start(context.Background(), vowifi.TunnelRequest{
-		DeviceID: "ec20-o2",
-		Identity: vowifi.SIMIdentity{
-			ICCID:   "8949200000000000000",
-			IMSI:    "262030123456789",
-			HomeMCC: "262",
-			HomeMNC: "03",
-		},
-		EPDG: "epdg.epc.mnc003.mcc262.pub.3gppnetwork.org",
-		AKA:  aka,
-	})
-	if !errors.Is(err, errFirstAuthObserved) {
-		t.Fatalf("Start() error = %v, want capture sentinel", err)
-	}
-	if capture.calls != 2 || capture.floated || aka.calls != 0 {
-		t.Fatalf("capture calls=%d floated=%v AKA calls=%d", capture.calls, capture.floated, aka.calls)
-	}
-}
-
 var _ io.Reader = constantReader{}
 var _ datagramTransport = (*firstAuthCaptureTransport)(nil)

internal/vowifi/ike/relay.go

@@ -15,7 +15,6 @@ type sessionRelay struct {
 	keys      ikeKeys
 	spii      [8]byte
 	spir      [8]byte
-	deleteID  uint32
 	natt      bool
 	keepalive time.Duration
 
@@ -34,7 +33,6 @@ func newSessionRelay(
 	keys ikeKeys,
 	initiatorSPI [8]byte,
 	responderSPI [8]byte,
-	deleteMessageID uint32,
 	natt bool,
 	keepalive time.Duration,
 ) *sessionRelay {
@@ -48,7 +46,6 @@ func newSessionRelay(
 		keys:      keys,
 		spii:      initiatorSPI,
 		spir:      responderSPI,
-		deleteID:  deleteMessageID,
 		natt:      natt,
 		keepalive: keepalive,
 		ctx:       ctx,
@@ -217,53 +214,6 @@ func (relay *sessionRelay) Close() error {
 	return errors.Join(relay.terminalErrorIfFailure(), transportErr)
 }
 
-func (relay *sessionRelay) CloseWithDelete(ctx context.Context) error {
-	deleteErr := relay.sendIKEDelete(ctx)
-	return errors.Join(deleteErr, relay.Close())
-}
-
-func (relay *sessionRelay) sendIKEDelete(ctx context.Context) error {
-	return sendIKESADelete(ctx, relay.transport, relay.suite, relay.keys, relay.spii, relay.spir, relay.deleteID)
-}
-
-func sendIKESADelete(
-	ctx context.Context,
-	transport datagramTransport,
-	suite negotiatedSuite,
-	keys ikeKeys,
-	initiatorSPI [8]byte,
-	responderSPI [8]byte,
-	messageID uint32,
-) error {
-	if ctx == nil {
-		ctx = context.Background()
-	}
-	if err := ctx.Err(); err != nil {
-		// Teardown is often called with the operation context already canceled.
-		// Give the protocol-level release a short independent chance to leave.
-		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(context.Background(), time.Second)
-		defer cancel()
-	}
-	request, err := encryptPayloads(ikeHeader{
-		InitiatorSPI: initiatorSPI,
-		ResponderSPI: responderSPI,
-		Exchange:     exchangeInformational,
-		Flags:        flagInitiator,
-		MessageID:    messageID,
-	}, []payload{{
-		Type: payloadDelete,
-		Body: []byte{protocolIKE, 0, 0, 0},
-	}}, suite, keys.SKei, keys.SKai, nil)
-	if err != nil {
-		return fmt.Errorf("ike: build IKE SA delete: %w", err)
-	}
-	if err := transport.SendSessionPacket(ctx, request, true); err != nil {
-		return fmt.Errorf("ike: send IKE SA delete: %w", err)
-	}
-	return nil
-}
-
 func (relay *sessionRelay) terminalErrorIfFailure() error {
 	relay.mu.Lock()
 	defer relay.mu.Unlock()

internal/vowifi/ike/relay_test.go

@@ -119,7 +119,6 @@ func TestSessionRelayCloseInterruptsStuckTransportRead(t *testing.T) {
 		ikeKeys{},
 		[8]byte{1},
 		[8]byte{2},
-		9,
 		true,
 		time.Hour,
 	)
@@ -157,7 +156,7 @@ func TestSessionRelayDemuxesESPAndAnswersEncryptedDPD(t *testing.T) {
 	}
 	spii := [8]byte{1}
 	spir := [8]byte{2}
-	relay := newSessionRelay(transport, suite, keys, spii, spir, 9, true, time.Hour)
+	relay := newSessionRelay(transport, suite, keys, spii, spir, true, time.Hour)
 	defer relay.Close()
 
 	esp := []byte{0, 0, 0, 9, 0, 0, 0, 1, 0xaa}
@@ -202,47 +201,6 @@ func TestSessionRelayDemuxesESPAndAnswersEncryptedDPD(t *testing.T) {
 	}
 }
 
-func TestSessionRelaySendsEncryptedIKESADelete(t *testing.T) {
-	transport := newFakeSessionTransport()
-	suite := legacyTestSuite()
-	keys := ikeKeys{
-		SKai: bytes.Repeat([]byte{0x11}, 20),
-		SKar: bytes.Repeat([]byte{0x12}, 20),
-		SKei: bytes.Repeat([]byte{0x13}, 16),
-		SKer: bytes.Repeat([]byte{0x14}, 16),
-	}
-	spii := [8]byte{1}
-	spir := [8]byte{2}
-	relay := newSessionRelay(transport, suite, keys, spii, spir, 9, true, time.Hour)
-	defer relay.Close()
-
-	if err := relay.sendIKEDelete(context.Background()); err != nil {
-		t.Fatalf("sendIKEDelete() error = %v", err)
-	}
-	select {
-	case sent := <-transport.sent:
-		if !sent.ike {
-			t.Fatal("IKE SA delete was sent as ESP")
-		}
-		header, payloads, err := decryptPayloads(sent.data, suite, keys.SKei, keys.SKai)
-		if err != nil {
-			t.Fatalf("decrypt IKE SA delete: %v", err)
-		}
-		if header.Exchange != exchangeInformational || header.MessageID != 9 || header.Flags != flagInitiator {
-			t.Fatalf("IKE SA delete header = %#v", header)
-		}
-		item, err := onePayload(payloads, payloadDelete)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !bytes.Equal(item.Body, []byte{protocolIKE, 0, 0, 0}) {
-			t.Fatalf("IKE SA delete body = %x", item.Body)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("relay did not send IKE SA delete")
-	}
-}
-
 func TestSessionRelaySendsNATKeepalive(t *testing.T) {
 	transport := newFakeSessionTransport()
 	relay := newSessionRelay(
@@ -251,7 +209,6 @@ func TestSessionRelaySendsNATKeepalive(t *testing.T) {
 		ikeKeys{},
 		[8]byte{1},
 		[8]byte{2},
-		9,
 		true,
 		10*time.Millisecond,
 	)
@@ -276,7 +233,6 @@ func TestSessionRelayDropsDelayedIKEPacketFromPreviousSA(t *testing.T) {
 		ikeKeys{},
 		spii,
 		spir,
-		9,
 		true,
 		time.Hour,
 	)

internal/vowifi/ike/wire.go

@@ -28,7 +28,6 @@ const (
 	payloadAuth      = 39
 	payloadNonce     = 40
 	payloadNotify    = 41
-	payloadDelete    = 42
 	payloadTSi       = 44
 	payloadTSr       = 45
 	payloadEncrypted = 46
@@ -55,14 +54,11 @@ const (
 	dhMODP2048               = 14
 	transformAttributeKeyLen = 14
 
-	notifyInitialContact  = 16384
-	notifyMOBIKESupported = 16396
-	notifyNATSource       = 16388
-	notifyNATDestination  = 16389
-	notifyEAPOnlyAuth     = 16417
-	notifyDeviceIdentity  = 41101
-	notifyInvalidKE       = 17
-	notifyNoProposal      = 14
+	notifyNATSource      = 16388
+	notifyNATDestination = 16389
+	notifyEAPOnlyAuth    = 16417
+	notifyInvalidKE      = 17
+	notifyNoProposal     = 14
 )
 
 var (

internal/vowifi/ike/wire_auth_test.go

@@ -3,7 +3,6 @@ package ike
 import (
 	"bytes"
 	"errors"
-	"slices"
 	"testing"
 
 	"vocat/internal/vowifi"
@@ -61,7 +60,7 @@ func TestInitialEAPOnlyAuthCarriesAPNIDrAndNotify(t *testing.T) {
 		dualStackTrafficSelectors(payloadTSi),
 		dualStackTrafficSelectors(payloadTSr),
 	)
-	if len(payloads) != 9 || payloads[0].Type != payloadIDi || payloads[1].Type != payloadIDr {
+	if len(payloads) != 7 || payloads[0].Type != payloadIDi || payloads[1].Type != payloadIDr {
 		t.Fatalf("initial auth payload order = %#v", payloads)
 	}
 	if got := string(payloads[1].Body[4:]); got != "ims" || payloads[1].Body[0] != 2 {
@@ -69,25 +68,11 @@ func TestInitialEAPOnlyAuthCarriesAPNIDrAndNotify(t *testing.T) {
 	}
 	kind, data, err := parseNotify(payloads[2])
 	if err != nil {
-		t.Fatalf("parseNotify(EAP_ONLY_AUTHENTICATION) error = %v", err)
+		t.Fatalf("parseNotify() error = %v", err)
 	}
 	if kind != notifyEAPOnlyAuth || len(data) != 0 {
 		t.Fatalf("notify = %d/%x, want EAP_ONLY_AUTHENTICATION", kind, data)
 	}
-	kind, data, err = parseNotify(payloads[3])
-	if err != nil {
-		t.Fatalf("parseNotify() error = %v", err)
-	}
-	if kind != notifyMOBIKESupported || len(data) != 0 {
-		t.Fatalf("notify = %d/%x, want MOBIKE_SUPPORTED", kind, data)
-	}
-	kind, data, err = parseNotify(payloads[4])
-	if err != nil {
-		t.Fatalf("parseNotify() error = %v", err)
-	}
-	if kind != notifyInitialContact || len(data) != 0 {
-		t.Fatalf("notify = %d/%x, want INITIAL_CONTACT", kind, data)
-	}
 	for _, kind := range []uint8{payloadTSi, payloadTSr} {
 		item, err := onePayload(payloads, kind)
 		if err != nil {
@@ -103,83 +88,6 @@ func TestInitialEAPOnlyAuthCarriesAPNIDrAndNotify(t *testing.T) {
 	}
 }
 
-func TestInitialStandardEAPAuthOmitsEAPOnlyNotify(t *testing.T) {
-	idi := payload{Type: payloadIDi, Body: []byte{3, 0, 0, 0, 'u'}}
-	idr := payload{Type: payloadIDr, Body: []byte{2, 0, 0, 0, 'i', 'm', 's'}}
-	payloads := buildInitialEAPAuth(
-		idi,
-		idr,
-		[]byte{1, 2, 3},
-		dualStackTrafficSelectors(payloadTSi),
-		dualStackTrafficSelectors(payloadTSr),
-		false,
-	)
-	if len(payloads) != 8 || payloads[0].Type != payloadIDi || payloads[1].Type != payloadIDr {
-		t.Fatalf("initial standard EAP payload order = %#v", payloads)
-	}
-	initialContact := 0
-	mobikeSupported := 0
-	for _, item := range payloadsOfType(payloads, payloadNotify) {
-		kind, _, err := parseNotify(item)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if kind == notifyEAPOnlyAuth {
-			t.Fatal("standard EAP initial request contains EAP_ONLY_AUTHENTICATION")
-		}
-		if kind == notifyInitialContact {
-			initialContact++
-		}
-		if kind == notifyMOBIKESupported {
-			mobikeSupported++
-		}
-	}
-	if initialContact != 1 {
-		t.Fatalf("standard EAP initial request INITIAL_CONTACT count = %d, want 1", initialContact)
-	}
-	if mobikeSupported != 1 {
-		t.Fatalf("standard EAP initial request MOBIKE_SUPPORTED count = %d, want 1", mobikeSupported)
-	}
-	if payloads[2].Type != payloadNotify || payloads[3].Type != payloadNotify {
-		t.Fatalf("standard EAP Android notify order = %#v", payloads[:4])
-	}
-}
-
-func TestConfigurationRequestMatchesAndroidAttributes(t *testing.T) {
-	cp := configurationRequest()
-	if cp.Type != payloadCP || len(cp.Body) < 4 || cp.Body[0] != configRequest {
-		t.Fatalf("configuration request = %#v", cp)
-	}
-	var attributes []uint16
-	for offset := 4; offset < len(cp.Body); {
-		if offset+4 > len(cp.Body) {
-			t.Fatalf("truncated attribute at %d", offset)
-		}
-		kind := uint16(cp.Body[offset])<<8 | uint16(cp.Body[offset+1])
-		length := int(cp.Body[offset+2])<<8 | int(cp.Body[offset+3])
-		if offset+4+length > len(cp.Body) {
-			t.Fatalf("attribute %d exceeds payload", kind)
-		}
-		attributes = append(attributes, kind)
-		offset += 4 + length
-	}
-	want := []uint16{1, 8, 3, 10, 20, 21, configApplicationVersion}
-	if !slices.Equal(attributes, want) {
-		t.Fatalf("configuration attributes = %v, want %v", attributes, want)
-	}
-}
-
-func TestO2GermanyUsesStandardEAPAuthentication(t *testing.T) {
-	for _, mnc := range []string{"03", "003"} {
-		if advertiseEAPOnlyAuthentication("262", mnc) {
-			t.Fatalf("O2 Germany 262-%s unexpectedly uses EAP-only", mnc)
-		}
-	}
-	if !advertiseEAPOnlyAuthentication("262", "02") || !advertiseEAPOnlyAuthentication("234", "15") {
-		t.Fatal("non-O2 PLMN lost the existing EAP-only policy")
-	}
-}
-
 func TestResponderIDrValidatorsSeparateEPDGAndAPN(t *testing.T) {
 	epdg := payload{
 		Type: payloadIDr,

internal/vowifi/ims/digest.go

@@ -168,7 +168,6 @@ func authenticateAKA(
 	provider vowifi.AKAProvider,
 	identity vowifi.SIMIdentity,
 	challenge digestChallenge,
-	preference string,
 ) (akaMaterial, error) {
 	nonce, err := decodeAKANonce(challenge.Nonce)
 	if err != nil {
@@ -179,18 +178,9 @@ func authenticateAKA(
 	var akaChallenge vowifi.AKAChallenge
 	copy(akaChallenge.RAND[:], nonce[:16])
 	copy(akaChallenge.AUTN[:], nonce[16:32])
-	var result vowifi.AKAResult
-	if preferred, ok := provider.(vowifi.PreferredAKAProvider); ok && strings.TrimSpace(preference) != "" {
-		result, err = preferred.AuthenticateWithPreference(ctx, identity, akaChallenge, preference)
-	} else {
-		result, err = provider.Authenticate(ctx, identity, akaChallenge)
-	}
+	result, err := provider.Authenticate(ctx, identity, akaChallenge)
 	if err != nil {
-		application := "USIM"
-		if strings.EqualFold(strings.TrimSpace(preference), "isim_strict") {
-			application = "ISIM"
-		}
-		return akaMaterial{}, fmt.Errorf("ims: %s AKA authentication failed: %w", application, err)
+		return akaMaterial{}, fmt.Errorf("ims: USIM AKA authentication failed: %w", err)
 	}
 	if result.SynchronizationFailure || len(result.AUTS) > 0 {
 		if !result.SynchronizationFailure || len(result.AUTS) != 14 {

internal/vowifi/ims/digest_test.go

@@ -16,21 +16,6 @@ type recordingAKA struct {
 	challenges []vowifi.AKAChallenge
 }
 
-type recordingPreferredAKA struct {
-	recordingAKA
-	preference string
-}
-
-func (aka *recordingPreferredAKA) AuthenticateWithPreference(
-	ctx context.Context,
-	identity vowifi.SIMIdentity,
-	challenge vowifi.AKAChallenge,
-	preference string,
-) (vowifi.AKAResult, error) {
-	aka.preference = preference
-	return aka.Authenticate(ctx, identity, challenge)
-}
-
 func (aka *recordingAKA) CheckReady(context.Context, vowifi.SIMIdentity) (vowifi.AKAEvidence, error) {
 	return vowifi.AKAEvidence{Ready: true, Application: "usim"}, nil
 }
@@ -75,7 +60,6 @@ func TestAuthenticateAKAMapsNonceToTypedChallenge(t *testing.T) {
 		aka,
 		vowifi.SIMIdentity{IMSI: "001010123456789"},
 		digestChallenge{Nonce: base64.StdEncoding.EncodeToString(nonceBytes)},
-		"",
 	)
 	if err != nil {
 		t.Fatalf("authenticateAKA() error = %v", err)
@@ -109,7 +93,6 @@ func TestAuthenticateAKAReturnsSynchronizationEvidence(t *testing.T) {
 		aka,
 		vowifi.SIMIdentity{},
 		digestChallenge{Nonce: nonce},
-		"",
 	)
 	if err != nil {
 		t.Fatalf("authenticateAKA() error = %v", err)
@@ -119,26 +102,6 @@ func TestAuthenticateAKAReturnsSynchronizationEvidence(t *testing.T) {
 	}
 }
 
-func TestAuthenticateAKAUsesPreferredApplicationWhenSupported(t *testing.T) {
-	nonce := base64.StdEncoding.EncodeToString(make([]byte, 32))
-	aka := &recordingPreferredAKA{recordingAKA: recordingAKA{
-		result: vowifi.AKAResult{RES: []byte{1, 2, 3, 4}},
-	}}
-	_, err := authenticateAKA(
-		context.Background(),
-		aka,
-		vowifi.SIMIdentity{IMSI: "310280000000001"},
-		digestChallenge{Nonce: nonce},
-		"isim_strict",
-	)
-	if err != nil {
-		t.Fatalf("authenticateAKA() error = %v", err)
-	}
-	if aka.preference != "isim_strict" {
-		t.Fatalf("preference = %q, want isim_strict", aka.preference)
-	}
-}
-
 func TestBuildDigestAuthorizationCarriesAUTSWithEmptyResponse(t *testing.T) {
 	authorization := buildDigestAuthorization(
 		digestChallenge{

internal/vowifi/ims/provider.go

@@ -8,7 +8,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"log/slog"
 	"net"
 	"strconv"
 	"strings"
@@ -53,18 +52,12 @@ type Config struct {
 	// SMSCenter is an operator-provided fallback when the SIM leaves EF_SMSP
 	// and AT+CSCA empty. It must be an international or national digit string.
 	SMSCenter string
-	// SMSCenterByPLMN provides narrow carrier fallbacks without applying one
-	// operator's service-centre address to every SIM.
-	SMSCenterByPLMN map[string]string
 	// OnSMS is invoked after a valid inbound RP-DATA/SMS-DELIVER has been
 	// decoded. Returning an error causes an RP-ERROR delivery report.
 	OnSMS func(context.Context, ReceivedSMS) error
 	// OnSMSStatus is invoked for an SMS-STATUS-REPORT received after a
 	// submission that requested a delivery report.
 	OnSMSStatus func(context.Context, ReceivedSMSStatus) error
-	// Logger receives structured IMS runtime diagnostics. Inbound SMS logs do
-	// not include message text or raw protocol payloads.
-	Logger *slog.Logger
 }
 
 // Provider implements vowifi.IMSProvider using a small RFC 3261 REGISTER
@@ -92,9 +85,6 @@ func NewProvider(aka vowifi.AKAProvider, config Config) (*Provider, error) {
 }
 
 func normalizeConfig(config Config) (Config, error) {
-	if config.Logger == nil {
-		config.Logger = slog.Default()
-	}
 	if config.Port == 0 {
 		config.Port = defaultSIPPort
 	}
@@ -130,19 +120,6 @@ func normalizeConfig(config Config) (Config, error) {
 		transportByPLMN[plmn] = transport
 	}
 	config.TransportByPLMN = transportByPLMN
-	smsCenterByPLMN := make(map[string]string, len(config.SMSCenterByPLMN))
-	for plmn, smsCenter := range config.SMSCenterByPLMN {
-		plmn = strings.TrimSpace(plmn)
-		smsCenter = strings.TrimSpace(smsCenter)
-		if !digitsBetween(plmn, 5, 6) {
-			return Config{}, fmt.Errorf("ims: invalid SMS service-centre PLMN %q", plmn)
-		}
-		if !validSMSCenter(smsCenter) {
-			return Config{}, fmt.Errorf("ims: invalid SMS service-centre address for PLMN %s", plmn)
-		}
-		smsCenterByPLMN[plmn] = smsCenter
-	}
-	config.SMSCenterByPLMN = smsCenterByPLMN
 	if strings.TrimSpace(config.UserAgent) == "" {
 		config.UserAgent = "vocat/1"
 	}
@@ -179,17 +156,15 @@ func normalizeConfig(config Config) (Config, error) {
 	config.PublicIdentity = strings.TrimSpace(config.PublicIdentity)
 	config.UserAgent = strings.TrimSpace(config.UserAgent)
 	config.SMSCenter = strings.TrimSpace(config.SMSCenter)
-	if config.SMSCenter != "" && !validSMSCenter(config.SMSCenter) {
-		return Config{}, errors.New("ims: configured SMS service-centre address is invalid")
+	if config.SMSCenter != "" {
+		digits := strings.TrimPrefix(config.SMSCenter, "+")
+		if !digitsBetween(digits, 3, 20) {
+			return Config{}, errors.New("ims: configured SMS service-centre address is invalid")
+		}
 	}
 	return config, nil
 }
 
-func validSMSCenter(value string) bool {
-	digits := strings.TrimPrefix(strings.TrimSpace(value), "+")
-	return digitsBetween(digits, 3, 20)
-}
-
 func (provider *Provider) Start(ctx context.Context, request vowifi.IMSRequest) (vowifi.IMSSession, error) {
 	if ctx == nil {
 		ctx = context.Background()
@@ -296,22 +271,13 @@ func deriveIdentities(identity vowifi.SIMIdentity, config Config) (identitySet,
 		mnc = "0" + mnc
 	}
 	domain := fmt.Sprintf("ims.mnc%s.mcc%s.3gppnetwork.org", mnc, mcc)
-	privateDomain := domain
-	publicDomain := domain
-	if vowifi.IsATT310280(identity) {
-		// AT&T provisions the IMPI and IMPU in its ISIM domains rather than
-		// the generic 3GPP PLMN IMS domain.
-		domain = "one.att.net"
-		privateDomain = "private.att.net"
-		publicDomain = "one.att.net"
-	}
 	privateIdentity := config.PrivateIdentity
 	if privateIdentity == "" {
-		privateIdentity = imsi + "@" + privateDomain
+		privateIdentity = imsi + "@" + domain
 	}
 	publicIdentity := config.PublicIdentity
 	if publicIdentity == "" {
-		publicIdentity = "sip:" + imsi + "@" + publicDomain
+		publicIdentity = "sip:" + imsi + "@" + domain
 	}
 	if strings.ContainsAny(privateIdentity+publicIdentity, "\r\n") ||
 		!strings.Contains(privateIdentity, "@") ||
@@ -568,33 +534,15 @@ func newSession(
 			refreshCancel()
 			return nil, errors.New("ims: protected local IP address is unavailable")
 		}
-		protectedClientPort := provider.config.ProtectedClientPort
-		protectedServerPort := provider.config.ProtectedServerPort
-		if vowifi.IsATT310280(request.Identity) && protectedServerPort == 0 {
-			protectedServerPort = 6000
-		}
-		if securityEncryptionForIdentity(request.Identity) == "null" {
-			if protectedClientPort == 0 {
-				protectedClientPort = 5062
-			}
-			if protectedServerPort == 0 {
-				protectedServerPort = 5063
-			}
-		}
 		proposal, err := newSecurityProposal(
 			localIP,
-			protectedClientPort,
-			protectedServerPort,
+			provider.config.ProtectedClientPort,
+			provider.config.ProtectedServerPort,
 		)
 		if err != nil {
 			refreshCancel()
 			return nil, err
 		}
-		proposal.encryption = securityEncryptionForIdentity(request.Identity)
-		if vowifi.IsATT310280(request.Identity) {
-			proposal.integrityAlgorithms = []string{"hmac-sha-1-96"}
-			proposal.encryptionAlgorithmsList = []string{"aes-cbc"}
-		}
 		session.securityProposal = proposal
 		protectedTCP, err := net.ListenTCP(
 			"tcp",
@@ -619,21 +567,6 @@ func newSession(
 	return session, nil
 }
 
-func securityEncryptionForIdentity(identity vowifi.SIMIdentity) string {
-	if usesO2GermanyIMSProfile(identity) {
-		// O2 Germany's P-CSCF advertises the 3GPP integrity-only ESP profile.
-		// Proposing aes-cbc is rejected before the AKA challenge is issued.
-		return "null"
-	}
-	return "aes-cbc"
-}
-
-func usesO2GermanyIMSProfile(identity vowifi.SIMIdentity) bool {
-	mcc := strings.TrimSpace(identity.HomeMCC)
-	mnc := strings.TrimLeft(strings.TrimSpace(identity.HomeMNC), "0")
-	return mcc+mnc == "2623"
-}
-
 func (session *Session) abort() {
 	session.refreshCancel()
 	_ = session.conn.Close()
@@ -702,15 +635,6 @@ func registrationRejectionError(response *sipResponse, phase string) error {
 			}
 		}
 	}
-	// P-Debug-Info is carrier-generated but can contain subscriber identifiers.
-	// Surface only a fixed classification for the O2 security-agreement error;
-	// never copy the raw header into logs or API responses.
-	for _, value := range response.values("P-Debug-Info") {
-		if strings.Contains(strings.ToLower(value), "no matched security item") {
-			message += "; carrier detail: no matched IMS security item"
-			break
-		}
-	}
 	return fmt.Errorf("%w: %s", ErrRegistrationRejected, message)
 }
 
@@ -773,11 +697,7 @@ func (session *Session) register(ctx context.Context, expires int) (*sipResponse
 		if err != nil {
 			return nil, err
 		}
-		preference := ""
-		if vowifi.IsATT310280(session.request.Identity) {
-			preference = "isim_strict"
-		}
-		material, err := authenticateAKA(ctx, session.provider.aka, session.request.Identity, challenge, preference)
+		material, err := authenticateAKA(ctx, session.provider.aka, session.request.Identity, challenge)
 		if err != nil {
 			return nil, err
 		}
@@ -837,10 +757,6 @@ func (session *Session) buildRegister(
 	authorizationHeader string,
 	authorization string,
 ) ([]byte, error) {
-	att310280 := vowifi.IsATT310280(session.request.Identity)
-	if att310280 {
-		expires = 18400
-	}
 	branch, err := randomHex(12)
 	if err != nil {
 		return nil, err
@@ -859,34 +775,6 @@ func (session *Session) buildRegister(
 		session.instanceID,
 		"urn%3Aurn-7%3A3gpp-service.ims.icsi.mmtel",
 	)
-	if att310280 {
-		contact = fmt.Sprintf(
-			`<sip:%s@%s;transport=%s>;+g.3gpp.accesstype="wlan1";audio;+g.3gpp.smsip;`+
-				`+g.3gpp.icsi-ref="%s";+sip.instance="<%s>"`,
-			session.identity.user,
-			contactAddress,
-			session.transport,
-			"urn%3Aurn-7%3A3gpp-service.ims.icsi.mmtel",
-			session.instanceID,
-		)
-	}
-	o2Germany := usesO2GermanyIMSProfile(session.request.Identity)
-	supported := "path, gruu"
-	allow := "REGISTER, INVITE, ACK, CANCEL, BYE, OPTIONS"
-	if o2Germany {
-		// Match the complete IMS capability set used by the previously working
-		// VoHive client. O2 validates more of the initial UE security profile
-		// than the other tested carriers do.
-		supported = "path, gruu, outbound, sec-agree, 100rel, timer"
-		allow = "INVITE, ACK, CANCEL, BYE, PRACK, UPDATE, INFO, MESSAGE, OPTIONS"
-	}
-	if att310280 {
-		supported = "path,sec-agree,gruu"
-	}
-	userAgent := strings.TrimSpace(session.provider.config.UserAgent)
-	if att310280 && (userAgent == "" || userAgent == "vocat/1") {
-		userAgent = "SimAdmin VoWiFi"
-	}
 	lines := []string{
 		"REGISTER " + requestURI + " SIP/2.0",
 		fmt.Sprintf("Via: SIP/2.0/%s %s;branch=z9hG4bK%s;rport", transportUpper, local, branch),
@@ -898,25 +786,14 @@ func (session *Session) buildRegister(
 		fmt.Sprintf("CSeq: %d REGISTER", cseq),
 		"Contact: " + contact,
 		fmt.Sprintf("Expires: %d", expires),
-		"Supported: " + supported,
-		"Allow: " + allow,
-		"User-Agent: " + userAgent,
-	}
-	if o2Germany {
-		lines = append(lines, "P-Preferred-Identity: <"+session.identity.public+">")
-	} else if att310280 {
-		lines = append(lines,
-			"P-Preferred-Identity: <"+session.identity.public+">",
-			`P-Visited-Network-ID: "one.att.net"`,
-			"P-Access-Network-Info: IEEE-802.11;i-wlan-node-id=000000000000;network-provided",
-			"Cellular-Network-Info: 3GPP-E-UTRAN-FDD;utran-cell-id-3gpp=3102800000000;cell-info-age=0",
-			"Accept-Contact: *;+g.3gpp.smsip",
-			`Accept-Contact: *;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-service.ims.icsi.mmtel"`,
-		)
+		"Supported: path, gruu",
+		"Allow: REGISTER, INVITE, ACK, CANCEL, BYE, OPTIONS",
+		"User-Agent: " + session.provider.config.UserAgent,
 	}
 	if session.securityOffered() {
-		lines = append(lines,
-			"Security-Client: "+session.securityClientValue(),
+		lines = append(
+			lines,
+			"Security-Client: "+session.securityProposal.headerValue(),
 			"Require: sec-agree",
 			"Proxy-Require: sec-agree",
 		)
@@ -1317,14 +1194,7 @@ func (session *Session) Close(ctx context.Context) error {
 	session.closeInboundConnections()
 	session.receiveDone.Wait()
 	if session.ipsecHandle != nil {
-		// XFRM teardown is local and must still run when SIP deregistration has
-		// consumed the caller's deadline. Use a fresh bounded context so a
-		// service restart or Profile switch cannot strand the previous SIM's
-		// transport-mode policies in the kernel.
-		cleanupContext, cleanupCancel := context.WithTimeout(context.Background(), 10*time.Second)
-		err := session.ipsecHandle.Close(cleanupContext)
-		cleanupCancel()
-		if err != nil {
+		if err := session.ipsecHandle.Close(ctx); err != nil {
 			cleanupErrors = append(cleanupErrors, err)
 		}
 	}

internal/vowifi/ims/provider_test.go

@@ -73,26 +73,6 @@ func TestTransportForIdentityPreservesLeadingZeroMNCs(t *testing.T) {
 	}
 }
 
-func TestNormalizeConfigValidatesSMSCentersByPLMN(t *testing.T) {
-	config, err := normalizeConfig(Config{SMSCenterByPLMN: map[string]string{
-		" 23410 ": " +447802000332 ",
-	}})
-	if err != nil {
-		t.Fatalf("normalizeConfig() error = %v", err)
-	}
-	if got := config.SMSCenterByPLMN["23410"]; got != "+447802000332" {
-		t.Fatalf("normalized O2 SMSC = %q", got)
-	}
-	for _, invalid := range []Config{
-		{SMSCenterByPLMN: map[string]string{"234": "+447802000332"}},
-		{SMSCenterByPLMN: map[string]string{"23410": "not-a-number"}},
-	} {
-		if _, err := normalizeConfig(invalid); err == nil {
-			t.Fatalf("normalizeConfig(%#v) succeeded", invalid.SMSCenterByPLMN)
-		}
-	}
-}
-
 func TestProviderRegisterAKAParseEvidenceAndClose(t *testing.T) {
 	for _, test := range []struct {
 		name         string
@@ -399,138 +379,6 @@ func serveRegistration(listener *net.UDPConn, nonce string, confirmSMS bool) err
 	return nil
 }
 
-func TestO2GermanyInitialRegisterMatchesSupportedIMSProfile(t *testing.T) {
-	client, server := net.Pipe()
-	defer client.Close()
-	defer server.Close()
-
-	identity := vowifi.SIMIdentity{
-		IMSI:    "262030123456789",
-		HomeMCC: "262",
-		HomeMNC: "03",
-	}
-	identities, err := deriveIdentities(identity, Config{})
-	if err != nil {
-		t.Fatalf("deriveIdentities() error = %v", err)
-	}
-	session := &Session{
-		provider: &Provider{config: Config{
-			SecurityMode: SecurityRequired,
-			UserAgent:    "vocat-test",
-		}},
-		request:    vowifi.IMSRequest{Identity: identity},
-		identity:   identities,
-		endpoint:   pcscfEndpoint{host: "pcscf.example", port: 5060},
-		transport:  "tcp",
-		conn:       client,
-		callID:     "o2-test",
-		fromTag:    "tag",
-		instanceID: "urn:uuid:test",
-		securityProposal: securityProposal{
-			spiClient:  101,
-			spiServer:  102,
-			portClient: 5062,
-			portServer: 5063,
-			encryption: "null",
-		},
-	}
-
-	packet, err := session.buildRegister(1, 3600, "", "")
-	if err != nil {
-		t.Fatalf("buildRegister() error = %v", err)
-	}
-	_, headers, err := parseTestRequest(packet)
-	if err != nil {
-		t.Fatalf("parseTestRequest() error = %v", err)
-	}
-	if got, want := headers["security-client"], "ipsec-3gpp;q=1.000;alg=hmac-sha-1-96;prot=esp;mod=trans;ealg=null;spi-c=0000000101;spi-s=0000000102;port-c=5062;port-s=5063"; got != want {
-		t.Fatalf("Security-Client = %q, want %q", got, want)
-	}
-	if headers["proxy-require"] != "sec-agree" || !strings.Contains(headers["authorization"], "integrity-protected=no") {
-		t.Fatalf("initial O2 headers omitted standardized sec-agree/IMS-AKA fields: %#v", headers)
-	}
-	if got, want := headers["p-preferred-identity"], "<"+identities.public+">"; got != want {
-		t.Fatalf("P-Preferred-Identity = %q, want %q", got, want)
-	}
-	for name, token := range map[string]string{
-		"supported": "sec-agree",
-		"allow":     "MESSAGE",
-	} {
-		if !strings.Contains(headers[name], token) {
-			t.Fatalf("%s = %q, want token %q", name, headers[name], token)
-		}
-	}
-}
-
-func TestATT310280DeriveIdentitiesUsesISIMDomains(t *testing.T) {
-	identities, err := deriveIdentities(vowifi.SIMIdentity{
-		IMSI: "310280000000001", HomeMCC: "310", HomeMNC: "280",
-	}, Config{})
-	if err != nil {
-		t.Fatalf("deriveIdentities() error = %v", err)
-	}
-	if identities.domain != "one.att.net" ||
-		identities.private != "[email protected]" ||
-		identities.public != "sip:[email protected]" {
-		t.Fatalf("AT&T identities = %#v", identities)
-	}
-}
-
-func TestATT310280InitialRegisterMatchesProvisionedProfile(t *testing.T) {
-	client, server := net.Pipe()
-	defer client.Close()
-	defer server.Close()
-
-	identity := vowifi.SIMIdentity{
-		IMSI: "310280000000001", HomeMCC: "310", HomeMNC: "280",
-	}
-	identities, err := deriveIdentities(identity, Config{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	session := &Session{
-		provider:   &Provider{config: Config{SecurityMode: SecurityRequired, UserAgent: "vocat/1"}},
-		request:    vowifi.IMSRequest{Identity: identity},
-		identity:   identities,
-		endpoint:   pcscfEndpoint{host: "pcscf.example", port: 5060},
-		transport:  "tcp",
-		conn:       client,
-		callID:     "att-test",
-		fromTag:    "tag",
-		instanceID: "urn:uuid:test",
-		securityProposal: securityProposal{
-			spiClient: 1546543, spiServer: 1546542,
-			portClient: 32773, portServer: 6000,
-			integrityAlgorithms:      []string{"hmac-sha-1-96"},
-			encryptionAlgorithmsList: []string{"aes-cbc"},
-		},
-	}
-	packet, err := session.buildRegister(1, 3600, "", "")
-	if err != nil {
-		t.Fatalf("buildRegister() error = %v", err)
-	}
-	request := string(packet)
-	for _, want := range []string{
-		"REGISTER sip:one.att.net SIP/2.0",
-		"Expires: 18400",
-		"Supported: path,sec-agree,gruu",
-		"User-Agent: SimAdmin VoWiFi",
-		`+g.3gpp.accesstype="wlan1";audio;+g.3gpp.smsip`,
-		"P-Preferred-Identity: <sip:[email protected]>",
-		`P-Visited-Network-ID: "one.att.net"`,
-		"P-Access-Network-Info: IEEE-802.11;i-wlan-node-id=000000000000;network-provided",
-		"Cellular-Network-Info: 3GPP-E-UTRAN-FDD;utran-cell-id-3gpp=3102800000000;cell-info-age=0",
-		"Accept-Contact: *;+g.3gpp.smsip",
-		"Security-Client: ipsec-3gpp; alg=hmac-sha-1-96; ealg=aes-cbc; prot=esp; mod=trans; spi-c=1546543; spi-s=1546542; port-c=32773; port-s=6000",
-		`username="[email protected]"`,
-		`uri="sip:one.att.net"`,
-	} {
-		if !strings.Contains(request, want) {
-			t.Fatalf("AT&T REGISTER omits %q:\n%s", want, request)
-		}
-	}
-}
-
 func serveRefreshFailure(listener *net.UDPConn, nonce string) error {
 	var callID string
 	for step := 0; step < 3; step++ {

internal/vowifi/ims/security.go

@@ -12,8 +12,6 @@ import (
 	"sort"
 	"strconv"
 	"strings"
-
-	"vocat/internal/vowifi"
 )
 
 type SecurityMode string
@@ -41,12 +39,6 @@ var (
 type IPSecSAConfig struct {
 	LocalIP  net.IP
 	RemoteIP net.IP
-	// IntegrityAlgorithm is the negotiated 3GPP Security-Server alg value.
-	// Supported values are hmac-md5-96 and hmac-sha-1-96.
-	IntegrityAlgorithm string
-	// EncryptionAlgorithm is the negotiated 3GPP Security-Server ealg value.
-	// Supported values are null, des-ede3-cbc, and aes-cbc.
-	EncryptionAlgorithm string
 
 	UEClientSPI    uint32
 	UEServerSPI    uint32
@@ -71,14 +63,10 @@ type IPSecSAInstaller interface {
 }
 
 type securityProposal struct {
-	spiClient                uint32
-	spiServer                uint32
-	portClient               int
-	portServer               int
-	encryption               string
-	fallbackEncryption       string
-	integrityAlgorithms      []string
-	encryptionAlgorithmsList []string
+	spiClient  uint32
+	spiServer  uint32
+	portClient int
+	portServer int
 }
 
 func newSecurityProposal(localIP net.IP, configuredClientPort int, configuredServerPort int) (securityProposal, error) {
@@ -108,98 +96,21 @@ func newSecurityProposal(localIP net.IP, configuredClientPort int, configuredSer
 		return securityProposal{}, errors.New("ims: protected UE ports must be distinct non-standard SIP ports")
 	}
 	return securityProposal{
-		spiClient:                spiClient,
-		spiServer:                spiServer,
-		portClient:               portClient,
-		portServer:               portServer,
-		integrityAlgorithms:      []string{"hmac-md5-96", "hmac-sha-1-96"},
-		encryptionAlgorithmsList: []string{"null", "des-ede3-cbc", "aes-cbc"},
+		spiClient:  spiClient,
+		spiServer:  spiServer,
+		portClient: portClient,
+		portServer: portServer,
 	}, nil
 }
 
 func (proposal securityProposal) headerValue() string {
-	// TS 33.203 defines spi-c and spi-s as exactly 10 decimal digits. Keep the
-	// complete mechanism explicit even where ESP/null defaults would permit a
-	// shorter form; this is the interoperable handset/IMS profile.
-	values := make([]string, 0, len(proposal.integrities())*len(proposal.encryptionAlgorithms()))
-	index := 0
-	for _, integrity := range proposal.integrities() {
-		for _, encryption := range proposal.encryptionAlgorithms() {
-			preference := fmt.Sprintf("0.%03d", 999-index)
-			if index == 0 {
-				preference = "1.000"
-			}
-			values = append(values, fmt.Sprintf(
-				"ipsec-3gpp;q=%s;alg=%s;prot=esp;mod=trans;ealg=%s;spi-c=%010d;spi-s=%010d;port-c=%d;port-s=%d",
-				preference,
-				integrity,
-				encryption,
-				proposal.spiClient,
-				proposal.spiServer,
-				proposal.portClient,
-				proposal.portServer,
-			))
-			index++
-		}
-	}
-	return strings.Join(values, ", ")
-}
-
-func (session *Session) securityClientValue() string {
-	if vowifi.IsATT310280(session.request.Identity) {
-		return fmt.Sprintf(
-			"ipsec-3gpp; alg=hmac-sha-1-96; ealg=aes-cbc; prot=esp; mod=trans; spi-c=%d; spi-s=%d; port-c=%d; port-s=%d",
-			session.securityProposal.spiClient,
-			session.securityProposal.spiServer,
-			session.securityProposal.portClient,
-			session.securityProposal.portServer,
-		)
-	}
-	return session.securityProposal.headerValue()
-}
-
-func (proposal securityProposal) encryptionAlgorithm() string {
-	if strings.EqualFold(strings.TrimSpace(proposal.encryption), "null") {
-		return "null"
-	}
-	return "aes-cbc"
-}
-
-func (proposal securityProposal) encryptionAlgorithms() []string {
-	if len(proposal.encryptionAlgorithmsList) > 0 {
-		return append([]string(nil), proposal.encryptionAlgorithmsList...)
-	}
-	algorithms := []string{proposal.encryptionAlgorithm()}
-	fallback := strings.ToLower(strings.TrimSpace(proposal.fallbackEncryption))
-	if (fallback == "aes-cbc" || fallback == "null") && fallback != algorithms[0] {
-		algorithms = append(algorithms, fallback)
-	}
-	return algorithms
-}
-
-func (proposal securityProposal) integrities() []string {
-	if len(proposal.integrityAlgorithms) > 0 {
-		return append([]string(nil), proposal.integrityAlgorithms...)
-	}
-	return []string{"hmac-sha-1-96"}
-}
-
-func (proposal securityProposal) supportsIntegrity(integrity string) bool {
-	for _, offered := range proposal.integrities() {
-		if strings.EqualFold(integrity, offered) {
-			return true
-		}
-	}
-	return false
-}
-
-func (proposal securityProposal) supportsEncryption(encryption string) bool {
-	for _, offered := range proposal.encryptionAlgorithms() {
-		if strings.EqualFold(encryption, offered) {
-			return true
-		}
-	}
-	return false
+	return fmt.Sprintf(
+		"ipsec-3gpp;q=1.000;alg=hmac-sha-1-96;prot=esp;mod=trans;ealg=aes-cbc;spi-c=%010d;spi-s=%010d;port-c=%d;port-s=%d",
+		proposal.spiClient,
+		proposal.spiServer,
+		proposal.portClient,
+		proposal.portServer,
+	)
 }
 
 func randomSPI(exclude uint32) (uint32, error) {
@@ -287,10 +198,10 @@ func parseSecurityAgreement(values []string, proposal securityProposal) (securit
 			continue
 		}
 		if !strings.EqualFold(mechanism.name, "ipsec-3gpp") ||
-			!proposal.supportsIntegrity(mechanism.algorithm) ||
+			!strings.EqualFold(mechanism.algorithm, "hmac-sha-1-96") ||
 			!strings.EqualFold(mechanism.protocol, "esp") ||
 			!strings.EqualFold(mechanism.mode, "trans") ||
-			!proposal.supportsEncryption(mechanism.encryption) {
+			!strings.EqualFold(mechanism.encryption, "aes-cbc") {
 			continue
 		}
 		if mechanism.spiClient == 0 || mechanism.spiServer == 0 ||
@@ -438,48 +349,16 @@ func preferenceValue(value string) (int, error) {
 	return numeric, nil
 }
 
-func expandIPSecKeys(ck []byte, ik []byte, encryptionAlgorithm, integrityAlgorithm string) (encryption []byte, integrity []byte, err error) {
+func expandIPSecKeys(ck []byte, ik []byte) (encryption []byte, integrity []byte, err error) {
 	if len(ck) != 16 || len(ik) != 16 {
 		return nil, nil, errors.New("ims: AKA did not return 16-byte CK and IK")
 	}
-	switch strings.ToLower(strings.TrimSpace(encryptionAlgorithm)) {
-	case "null":
-		encryption = nil
-	case "aes-cbc", "":
-		encryption = append([]byte(nil), ck...)
-	case "des-ede3-cbc":
-		encryption = append(encryption, ck...)
-		encryption = append(encryption, ck[:8]...)
-		for index, value := range encryption {
-			encryption[index] = withOddDESParity(value)
-		}
-	default:
-		return nil, nil, errors.New("ims: unsupported ipsec-3gpp encryption algorithm")
-	}
-	switch strings.ToLower(strings.TrimSpace(integrityAlgorithm)) {
-	case "hmac-md5-96":
-		integrity = append([]byte(nil), ik...)
-	case "hmac-sha-1-96", "":
-		integrity = make([]byte, 20)
-		copy(integrity, ik)
-	default:
-		return nil, nil, errors.New("ims: unsupported ipsec-3gpp integrity algorithm")
-	}
+	encryption = append([]byte(nil), ck...)
+	integrity = make([]byte, 20)
+	copy(integrity, ik)
 	return encryption, integrity, nil
 }
 
-func withOddDESParity(value byte) byte {
-	value &^= 1
-	ones := 0
-	for bits := value; bits != 0; bits >>= 1 {
-		ones += int(bits & 1)
-	}
-	if ones%2 == 0 {
-		value |= 1
-	}
-	return value
-}
-
 type xfrmOperation struct {
 	description string
 	arguments   []string
@@ -503,31 +382,20 @@ func buildXFRMInstallPlan(config IPSecSAConfig) ([]xfrmOperation, error) {
 		{"outbound UE-server to P-CSCF-client state", config.LocalIP, config.RemoteIP, config.PCSCFClientSPI, serverPairReqID(config)},
 	}
 	for _, state := range states {
-		arguments := []string{
-			"xfrm", "state", "add",
-			"src", state.source.String(),
-			"dst", state.destination.String(),
-			"proto", "esp",
-			"spi", fmt.Sprintf("0x%08x", state.spi),
-			"reqid", strconv.FormatUint(uint64(state.reqid), 10),
-			"mode", "transport",
-			"replay-window", "32",
-			"auth-trunc", xfrmIntegrityAlgorithm(config), "0x" + hex.EncodeToString(config.IntegrityKey), "96",
-		}
-		switch ipsecEncryptionAlgorithm(config) {
-		case "aes-cbc":
-			arguments = append(arguments, "enc", "cbc(aes)", "0x"+hex.EncodeToString(config.EncryptionKey))
-		case "des-ede3-cbc":
-			arguments = append(arguments, "enc", "cbc(des3_ede)", "0x"+hex.EncodeToString(config.EncryptionKey))
-		default:
-			// Linux requires an explicit encryption transform for ESP even when
-			// 3GPP negotiates ealg=null. iproute2 must receive a genuinely empty
-			// key argument; the textual value "0x" is rejected by XFRM as EINVAL.
-			arguments = append(arguments, "enc", "cipher_null", "")
-		}
 		operations = append(operations, xfrmOperation{
 			description: state.description,
-			arguments:   arguments,
+			arguments: []string{
+				"xfrm", "state", "add",
+				"src", state.source.String(),
+				"dst", state.destination.String(),
+				"proto", "esp",
+				"spi", fmt.Sprintf("0x%08x", state.spi),
+				"reqid", strconv.FormatUint(uint64(state.reqid), 10),
+				"mode", "transport",
+				"replay-window", "32",
+				"auth-trunc", "hmac(sha1)", "0x" + hex.EncodeToString(config.IntegrityKey), "96",
+				"enc", "cbc(aes)", "0x" + hex.EncodeToString(config.EncryptionKey),
+			},
 		})
 	}
 	for _, flow := range xfrmFlows(config) {
@@ -720,43 +588,12 @@ func validateIPSecSAConfig(config IPSecSAConfig) error {
 		config.PCSCFClientPort == config.PCSCFServerPort {
 		return errors.New("ims: client and server protected ports must differ")
 	}
-	if ipsecEncryptionAlgorithm(config) != "null" && ipsecEncryptionAlgorithm(config) != "aes-cbc" && ipsecEncryptionAlgorithm(config) != "des-ede3-cbc" {
-		return errors.New("ims: unsupported ipsec-3gpp encryption algorithm")
-	}
-	if ipsecIntegrityAlgorithm(config) != "hmac-md5-96" && ipsecIntegrityAlgorithm(config) != "hmac-sha-1-96" {
-		return errors.New("ims: unsupported ipsec-3gpp integrity algorithm")
-	}
-	wantEncryptionKey := map[string]int{"null": 0, "aes-cbc": 16, "des-ede3-cbc": 24}[ipsecEncryptionAlgorithm(config)]
-	wantIntegrityKey := map[string]int{"hmac-md5-96": 16, "hmac-sha-1-96": 20}[ipsecIntegrityAlgorithm(config)]
-	if len(config.EncryptionKey) != wantEncryptionKey || len(config.IntegrityKey) != wantIntegrityKey {
+	if len(config.EncryptionKey) != 16 || len(config.IntegrityKey) != 20 {
 		return errors.New("ims: ipsec-3gpp key length is invalid")
 	}
 	return nil
 }
 
-func ipsecIntegrityAlgorithm(config IPSecSAConfig) string {
-	algorithm := strings.ToLower(strings.TrimSpace(config.IntegrityAlgorithm))
-	if algorithm == "" {
-		return "hmac-sha-1-96"
-	}
-	return algorithm
-}
-
-func xfrmIntegrityAlgorithm(config IPSecSAConfig) string {
-	if ipsecIntegrityAlgorithm(config) == "hmac-md5-96" {
-		return "hmac(md5)"
-	}
-	return "hmac(sha1)"
-}
-
-func ipsecEncryptionAlgorithm(config IPSecSAConfig) string {
-	algorithm := strings.ToLower(strings.TrimSpace(config.EncryptionAlgorithm))
-	if algorithm == "" {
-		return "aes-cbc"
-	}
-	return algorithm
-}
-
 func cloneIPSecSAConfig(config IPSecSAConfig) IPSecSAConfig {
 	config.LocalIP = append(net.IP(nil), config.LocalIP...)
 	config.RemoteIP = append(net.IP(nil), config.RemoteIP...)
@@ -820,7 +657,7 @@ func (session *Session) activateIPSec(
 	if !session.securityOffered() {
 		return ErrIPSecAgreementRequired
 	}
-	encryptionKey, integrityKey, err := expandIPSecKeys(ck, ik, agreement.selected.encryption, agreement.selected.algorithm)
+	encryptionKey, integrityKey, err := expandIPSecKeys(ck, ik)
 	if err != nil {
 		return err
 	}
@@ -834,20 +671,18 @@ func (session *Session) activateIPSec(
 	}
 	selected := agreement.selected
 	config := IPSecSAConfig{
-		LocalIP:             localIP,
-		RemoteIP:            remoteIP,
-		IntegrityAlgorithm:  selected.algorithm,
-		EncryptionAlgorithm: selected.encryption,
-		UEClientSPI:         session.securityProposal.spiClient,
-		UEServerSPI:         session.securityProposal.spiServer,
-		PCSCFClientSPI:      selected.spiClient,
-		PCSCFServerSPI:      selected.spiServer,
-		UEClientPort:        session.securityProposal.portClient,
-		UEServerPort:        session.securityProposal.portServer,
-		PCSCFClientPort:     selected.portClient,
-		PCSCFServerPort:     selected.portServer,
-		EncryptionKey:       encryptionKey,
-		IntegrityKey:        integrityKey,
+		LocalIP:         localIP,
+		RemoteIP:        remoteIP,
+		UEClientSPI:     session.securityProposal.spiClient,
+		UEServerSPI:     session.securityProposal.spiServer,
+		PCSCFClientSPI:  selected.spiClient,
+		PCSCFServerSPI:  selected.spiServer,
+		UEClientPort:    session.securityProposal.portClient,
+		UEServerPort:    session.securityProposal.portServer,
+		PCSCFClientPort: selected.portClient,
+		PCSCFServerPort: selected.portServer,
+		EncryptionKey:   encryptionKey,
+		IntegrityKey:    integrityKey,
 	}
 	handle, err := session.provider.installer.Install(ctx, config)
 	if err != nil {

internal/vowifi/ims/security_provider_test.go

@@ -23,9 +23,8 @@ type fakeIPSecInstaller struct {
 }
 
 type fakeIPSecHandle struct {
-	mu              sync.Mutex
-	closeCount      int
-	closeContextErr error
+	mu         sync.Mutex
+	closeCount int
 }
 
 func (installer *fakeIPSecInstaller) Install(
@@ -54,11 +53,10 @@ func (installer *fakeIPSecInstaller) installed() []IPSecSAConfig {
 	return result
 }
 
-func (handle *fakeIPSecHandle) Close(ctx context.Context) error {
+func (handle *fakeIPSecHandle) Close(context.Context) error {
 	handle.mu.Lock()
 	defer handle.mu.Unlock()
 	handle.closeCount++
-	handle.closeContextErr = ctx.Err()
 	return nil
 }
 
@@ -68,38 +66,6 @@ func (handle *fakeIPSecHandle) closes() int {
 	return handle.closeCount
 }
 
-func (handle *fakeIPSecHandle) contextError() error {
-	handle.mu.Lock()
-	defer handle.mu.Unlock()
-	return handle.closeContextErr
-}
-
-func TestSessionCloseCleansIPSecAfterCallerDeadline(t *testing.T) {
-	client, server := net.Pipe()
-	defer server.Close()
-	refreshDone := make(chan struct{})
-	close(refreshDone)
-	handle := &fakeIPSecHandle{}
-	session := &Session{
-		conn:          client,
-		refreshCancel: func() {},
-		refreshDone:   refreshDone,
-		ipsecHandle:   handle,
-		calls:         make(map[string]*imsCall),
-	}
-	ctx, cancel := context.WithCancel(context.Background())
-	cancel()
-	if err := session.Close(ctx); err != nil {
-		t.Fatalf("Close() error = %v", err)
-	}
-	if handle.closes() != 1 {
-		t.Fatalf("IPsec close count = %d, want 1", handle.closes())
-	}
-	if err := handle.contextError(); err != nil {
-		t.Fatalf("IPsec cleanup inherited expired caller context: %v", err)
-	}
-}
-
 func TestProviderNegotiatesIPSecAndRegistersOverProtectedTCP(t *testing.T) {
 	localIP := net.ParseIP("127.0.0.1")
 	remoteIP := net.ParseIP("127.0.0.2")
@@ -420,12 +386,7 @@ func serveProtectedRegistrar(
 		return result, fmt.Errorf("initial sec-agree headers = %#v", headers)
 	}
 	result.securityClient = headers["security-client"]
-	offers := splitHeaderValues([]string{result.securityClient})
-	if len(offers) != 6 {
-		_ = initialConnection.Close()
-		return result, fmt.Errorf("initial Security-Client offers = %d, want 6", len(offers))
-	}
-	proposal, err := parseSecurityMechanism(offers[0])
+	proposal, err := parseSecurityMechanism(result.securityClient)
 	if err != nil {
 		_ = initialConnection.Close()
 		return result, fmt.Errorf("parse initial Security-Client: %w", err)

internal/vowifi/ims/security_test.go

@@ -6,8 +6,6 @@ import (
 	"reflect"
 	"strings"
 	"testing"
-
-	"vocat/internal/vowifi"
 )
 
 func TestParseSecurityAgreementSelectsSupportedIPSec(t *testing.T) {
@@ -38,51 +36,6 @@ func TestParseSecurityAgreementSelectsSupportedIPSec(t *testing.T) {
 	}
 }
 
-func TestO2GermanySecurityProposalUsesIntegrityOnlyESP(t *testing.T) {
-	identity := vowifi.SIMIdentity{HomeMCC: "262", HomeMNC: "03"}
-	if got := securityEncryptionForIdentity(identity); got != "null" {
-		t.Fatalf("O2 security encryption = %q, want null", got)
-	}
-	proposal := securityProposal{
-		spiClient: 1001, spiServer: 1002,
-		portClient: 40666, portServer: 55610,
-		encryption: securityEncryptionForIdentity(identity),
-	}
-	if got, want := proposal.headerValue(), "ipsec-3gpp;q=1.000;alg=hmac-sha-1-96;prot=esp;mod=trans;ealg=null;spi-c=0000001001;spi-s=0000001002;port-c=40666;port-s=55610"; got != want {
-		t.Fatalf("O2 Security-Client = %q, want %q", got, want)
-	}
-	selected := "ipsec-3gpp;q=1.000;alg=hmac-sha-1-96;prot=esp;mod=trans;" +
-		"ealg=null;spi-c=2001;spi-s=2002;port-c=50601;port-s=50600"
-	if _, err := parseSecurityAgreement([]string{selected}, proposal); err != nil {
-		t.Fatalf("O2 null Security-Server rejected: %v", err)
-	}
-
-	identity.HomeMNC = "02"
-	if got := securityEncryptionForIdentity(identity); got != "aes-cbc" {
-		t.Fatalf("non-O2 security encryption = %q, want aes-cbc", got)
-	}
-}
-
-func TestSecurityAgreementAcceptsO2FallbackEncryption(t *testing.T) {
-	proposal := securityProposal{
-		spiClient:          1001,
-		spiServer:          1002,
-		portClient:         5062,
-		portServer:         5063,
-		encryption:         "null",
-		fallbackEncryption: "aes-cbc",
-	}
-	value := "ipsec-3gpp;q=0.5;alg=hmac-sha-1-96;prot=esp;mod=trans;" +
-		"ealg=aes-cbc;spi-c=2001;spi-s=2002;port-c=50601;port-s=50600"
-	agreement, err := parseSecurityAgreement([]string{value}, proposal)
-	if err != nil {
-		t.Fatalf("parseSecurityAgreement(aes-cbc fallback) error = %v", err)
-	}
-	if got := agreement.selected.encryption; got != "aes-cbc" {
-		t.Fatalf("selected encryption = %q, want aes-cbc", got)
-	}
-}
-
 func TestParseSecurityAgreementSkipsIncompleteCarrierAlternatives(t *testing.T) {
 	proposal := securityProposal{
 		spiClient:  1001,
@@ -168,7 +121,7 @@ func TestParseSecurityAgreementFailsClosed(t *testing.T) {
 func TestExpandIPSecKeys(t *testing.T) {
 	ck := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}
 	ik := []byte{16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-	encryption, integrity, err := expandIPSecKeys(ck, ik, "aes-cbc", "hmac-sha-1-96")
+	encryption, integrity, err := expandIPSecKeys(ck, ik)
 	if err != nil {
 		t.Fatalf("expandIPSecKeys() error = %v", err)
 	}
@@ -186,71 +139,6 @@ func TestExpandIPSecKeys(t *testing.T) {
 	}
 }
 
-func TestExpandIPSecKeysForAndroidAlgorithmSet(t *testing.T) {
-	ck := []byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18}
-	ik := []byte{0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38}
-	tripleDES, md5Key, err := expandIPSecKeys(ck, ik, "des-ede3-cbc", "hmac-md5-96")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(tripleDES) != 24 || len(md5Key) != 16 {
-		t.Fatalf("3DES/MD5 key lengths = %d/%d", len(tripleDES), len(md5Key))
-	}
-	for _, value := range tripleDES {
-		ones := 0
-		for bits := value; bits != 0; bits >>= 1 {
-			ones += int(bits & 1)
-		}
-		if ones%2 != 1 {
-			t.Fatalf("3DES byte %02x does not have odd parity", value)
-		}
-	}
-	nullKey, sha1Key, err := expandIPSecKeys(ck, ik, "null", "hmac-sha-1-96")
-	if err != nil || len(nullKey) != 0 || len(sha1Key) != 20 {
-		t.Fatalf("null/SHA1 keys = %d/%d, %v", len(nullKey), len(sha1Key), err)
-	}
-}
-
-func TestAndroidIMSProposalOffersAllDefaultAlgorithms(t *testing.T) {
-	proposal := securityProposal{
-		spiClient: 1001, spiServer: 1002, portClient: 5062, portServer: 5063,
-		integrityAlgorithms:      []string{"hmac-md5-96", "hmac-sha-1-96"},
-		encryptionAlgorithmsList: []string{"null", "des-ede3-cbc", "aes-cbc"},
-	}
-	header := proposal.headerValue()
-	for _, combination := range []string{
-		"alg=hmac-md5-96;prot=esp;mod=trans;ealg=null",
-		"alg=hmac-md5-96;prot=esp;mod=trans;ealg=des-ede3-cbc",
-		"alg=hmac-md5-96;prot=esp;mod=trans;ealg=aes-cbc",
-		"alg=hmac-sha-1-96;prot=esp;mod=trans;ealg=null",
-		"alg=hmac-sha-1-96;prot=esp;mod=trans;ealg=des-ede3-cbc",
-		"alg=hmac-sha-1-96;prot=esp;mod=trans;ealg=aes-cbc",
-	} {
-		if !strings.Contains(header, combination) {
-			t.Fatalf("Android IMS Security-Client omitted %q: %s", combination, header)
-		}
-	}
-	if got := len(splitHeaderValues([]string{header})); got != 6 {
-		t.Fatalf("Security-Client mechanism count = %d, want 6", got)
-	}
-}
-
-func TestNewSecurityProposalUsesAndroidDefaultsForEveryCarrier(t *testing.T) {
-	proposal, err := newSecurityProposal(net.ParseIP("127.0.0.1"), 45062, 45063)
-	if err != nil {
-		t.Fatalf("newSecurityProposal() error = %v", err)
-	}
-	if got, want := proposal.integrities(), []string{"hmac-md5-96", "hmac-sha-1-96"}; !reflect.DeepEqual(got, want) {
-		t.Fatalf("integrity algorithms = %v, want %v", got, want)
-	}
-	if got, want := proposal.encryptionAlgorithms(), []string{"null", "des-ede3-cbc", "aes-cbc"}; !reflect.DeepEqual(got, want) {
-		t.Fatalf("encryption algorithms = %v, want %v", got, want)
-	}
-	if got := len(splitHeaderValues([]string{proposal.headerValue()})); got != 6 {
-		t.Fatalf("Security-Client mechanism count = %d, want 6", got)
-	}
-}
-
 func TestXFRMPlanContainsFourStatesAndProtocolSpecificPolicies(t *testing.T) {
 	config := testIPSecSAConfig()
 	install, err := buildXFRMInstallPlan(config)
@@ -321,46 +209,6 @@ func TestXFRMPlanContainsFourStatesAndProtocolSpecificPolicies(t *testing.T) {
 	}
 }
 
-func TestXFRMPlanSupportsIntegrityOnlyESP(t *testing.T) {
-	config := testIPSecSAConfig()
-	config.EncryptionAlgorithm = "null"
-	config.EncryptionKey = nil
-	install, err := buildXFRMInstallPlan(config)
-	if err != nil {
-		t.Fatalf("buildXFRMInstallPlan(null) error = %v", err)
-	}
-	for index, operation := range install[:4] {
-		joined := strings.Join(operation.arguments, " ")
-		if !strings.Contains(joined, "auth-trunc hmac(sha1)") {
-			t.Fatalf("null state %d omitted integrity: %v", index, operation.arguments)
-		}
-		if !containsArguments(operation.arguments, "enc", "cipher_null", "") {
-			t.Fatalf("null state %d omitted Linux NULL cipher: %v", index, operation.arguments)
-		}
-	}
-}
-
-func TestXFRMPlanSupportsAndroidMD5AndTripleDES(t *testing.T) {
-	config := testIPSecSAConfig()
-	config.IntegrityAlgorithm = "hmac-md5-96"
-	config.EncryptionAlgorithm = "des-ede3-cbc"
-	config.IntegrityKey = []byte(strings.Repeat("\x22", 16))
-	config.EncryptionKey = []byte(strings.Repeat("\x11", 24))
-
-	install, err := buildXFRMInstallPlan(config)
-	if err != nil {
-		t.Fatalf("buildXFRMInstallPlan() error = %v", err)
-	}
-	for index, operation := range install[:4] {
-		if !containsArguments(operation.arguments, "auth-trunc", "hmac(md5)", "0x"+strings.Repeat("22", 16), "96") {
-			t.Fatalf("state %d omitted HMAC-MD5-96 transform: %v", index, operation.arguments)
-		}
-		if !containsArguments(operation.arguments, "enc", "cbc(des3_ede)", "0x"+strings.Repeat("11", 24)) {
-			t.Fatalf("state %d omitted 3DES-CBC transform: %v", index, operation.arguments)
-		}
-	}
-}
-
 func TestValidateIPSecSAConfigRejectsDuplicateSPI(t *testing.T) {
 	config := testIPSecSAConfig()
 	config.PCSCFServerSPI = config.UEClientSPI

internal/vowifi/ims/sms_runtime.go

@@ -2,17 +2,10 @@ package ims
 
 import (
 	"bufio"
-	"bytes"
 	"context"
-	"encoding/base64"
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"io"
-	"log/slog"
-	"mime"
-	"mime/multipart"
-	"mime/quotedprintable"
 	"net"
 	"strconv"
 	"strings"
@@ -22,11 +15,7 @@ import (
 	"vocat/internal/vowifi"
 )
 
-const (
-	smsContentType          = "application/vnd.3gpp.sms"
-	sipMessageRetransmitT1  = 500 * time.Millisecond
-	sipMessageRetransmitMax = 4 * time.Second
-)
+const smsContentType = "application/vnd.3gpp.sms"
 
 var (
 	ErrSMSCUnavailable = errors.New("ims: SMS service-centre address is unavailable")
@@ -163,11 +152,6 @@ func (session *Session) readInboundTCP(connection net.Conn) {
 	for {
 		packet, err := readSIPPacket(reader)
 		if err != nil {
-			if !session.isClosed() && !errors.Is(err, io.EOF) && !errors.Is(err, net.ErrClosed) {
-				session.logInboundSMS(slog.LevelWarn, "IMS protected SIP packet read failed", nil,
-					"stage", "sip_parse", "transport", "tcp",
-					"remote", connection.RemoteAddr().String(), "error", err)
-			}
 			return
 		}
 		session.dispatchPacket(packet, func(response []byte) error {
@@ -190,9 +174,6 @@ func (session *Session) readProtectedUDP() {
 		}
 		packet, err := parseSIPPacket(buffer[:count])
 		if err != nil {
-			session.logInboundSMS(slog.LevelWarn, "IMS protected SIP packet parse failed", nil,
-				"stage", "sip_parse", "transport", "udp", "remote", remote.String(),
-				"packet_bytes", count, "error", err)
 			continue
 		}
 		session.dispatchPacket(packet, func(response []byte) error {
@@ -217,8 +198,6 @@ func (session *Session) dispatchPacket(packet sipPacket, respond func([]byte) er
 		response := packet.Response
 		cseq, method, err := cseqNumber(response.value("CSeq"))
 		if err != nil {
-			session.logOutboundSMS(slog.LevelWarn, "IMS SIP response could not be matched",
-				"stage", "sip_response", "sip_status", response.StatusCode, "error", err)
 			return
 		}
 		key := sipTransactionKey{
@@ -234,10 +213,6 @@ func (session *Session) dispatchPacket(packet sipPacket, respond func([]byte) er
 			case channel <- response:
 			default:
 			}
-		} else if method == "MESSAGE" {
-			session.logOutboundSMS(slog.LevelWarn, "IMS SIP MESSAGE response was unmatched",
-				"stage", "sip_response", "call_id", key.callID,
-				"cseq", key.cseq, "sip_status", response.StatusCode)
 		}
 		return
 	}
@@ -265,64 +240,22 @@ func (session *Session) exchangeRuntime(
 		session.transactionsMu.Unlock()
 	}()
 
-	writeRequest := func() error {
-		session.writeMu.Lock()
-		defer session.writeMu.Unlock()
-		_, err := session.conn.Write(request)
-		return err
-	}
-	if err := writeRequest(); err != nil {
+	session.writeMu.Lock()
+	_, err := session.conn.Write(request)
+	session.writeMu.Unlock()
+	if err != nil {
 		return nil, fmt.Errorf("ims: send SIP %s: %w", key.method, err)
 	}
 	timer := time.NewTimer(session.provider.config.TransactionTimeout)
 	defer timer.Stop()
-	var retransmitTimer *time.Timer
-	var retransmit <-chan time.Time
-	retransmitInterval := sipMessageRetransmitT1
-	retransmitCount := 0
-	if session.transport == "udp" && key.method == "MESSAGE" {
-		retransmitTimer = time.NewTimer(retransmitInterval)
-		retransmit = retransmitTimer.C
-		defer retransmitTimer.Stop()
-	}
 	for {
 		select {
 		case <-ctx.Done():
 			return nil, ctx.Err()
 		case <-timer.C:
-			if retransmitTimer != nil {
-				return nil, fmt.Errorf(
-					"ims: SIP %s transaction timed out after %d retransmissions",
-					key.method,
-					retransmitCount,
-				)
-			}
 			return nil, fmt.Errorf("ims: SIP %s transaction timed out", key.method)
-		case <-retransmit:
-			if err := writeRequest(); err != nil {
-				return nil, fmt.Errorf("ims: retransmit SIP %s: %w", key.method, err)
-			}
-			retransmitCount++
-			session.logOutboundSMS(slog.LevelDebug, "IMS SIP MESSAGE retransmitted",
-				"stage", "sip_retransmit", "call_id", key.callID,
-				"cseq", key.cseq, "attempt", retransmitCount)
-			retransmitInterval *= 2
-			if retransmitInterval > sipMessageRetransmitMax {
-				retransmitInterval = sipMessageRetransmitMax
-			}
-			retransmitTimer.Reset(retransmitInterval)
 		case response := <-responses:
 			if response.StatusCode >= 100 && response.StatusCode < 200 {
-				if retransmitTimer != nil {
-					if !retransmitTimer.Stop() {
-						select {
-						case <-retransmitTimer.C:
-						default:
-						}
-					}
-					retransmitInterval = sipMessageRetransmitMax
-					retransmitTimer.Reset(retransmitInterval)
-				}
 				continue
 			}
 			return response, nil
@@ -338,44 +271,23 @@ func (session *Session) handleSIPRequest(request *sipRequest, respond func([]byt
 	switch request.Method {
 	case "OPTIONS":
 	case "MESSAGE":
-		if !supportsSMSContentType(request.value("Content-Type")) {
+		contentType := strings.ToLower(strings.TrimSpace(strings.SplitN(request.value("Content-Type"), ";", 2)[0]))
+		if contentType != smsContentType {
 			status = 415
 		}
 	default:
 		status = 405
 	}
 	response, err := buildSIPResponse(request, status, session.fromTag)
-	if err != nil {
-		session.logInboundSMS(slog.LevelWarn, "IMS inbound SIP request response failed", request,
-			"stage", "sip_response_build", "error", err)
-	} else if err = respond(response); err != nil {
-		session.logInboundSMS(slog.LevelWarn, "IMS inbound SIP request response failed", request,
-			"stage", "sip_response_send", "sip_status", status, "error", err)
+	if err == nil {
+		_ = respond(response)
 	}
 	if status != 200 || request.Method != "MESSAGE" {
-		if request.Method == "MESSAGE" {
-			session.logInboundSMS(slog.LevelWarn, "IMS inbound SMS MESSAGE rejected", request,
-				"stage", "content_type", "sip_status", status)
-		}
 		return
 	}
-	session.logInboundSMS(slog.LevelInfo, "IMS inbound SMS MESSAGE received", request,
-		"stage", "sip_accepted")
 	go session.processSMSMessage(request)
 }
 
-func supportsSMSContentType(value string) bool {
-	mediaType, parameters, err := mime.ParseMediaType(strings.TrimSpace(value))
-	if err != nil {
-		return false
-	}
-	if strings.EqualFold(mediaType, smsContentType) {
-		return true
-	}
-	return strings.EqualFold(mediaType, "multipart/mixed") &&
-		strings.TrimSpace(parameters["boundary"]) != ""
-}
-
 func buildSIPResponse(request *sipRequest, status int, tag string) ([]byte, error) {
 	reason := map[int]string{200: "OK", 405: "Method Not Allowed", 415: "Unsupported Media Type", 488: "Not Acceptable Here"}[status]
 	if reason == "" {
@@ -413,46 +325,24 @@ func buildSIPResponse(request *sipRequest, status int, tag string) ([]byte, erro
 }
 
 func (session *Session) processSMSMessage(request *sipRequest) {
-	payload, payloadSource, err := extractSMSPayload(request)
+	rpdu, err := parseRPDU(request.Body)
 	if err != nil {
-		session.logInboundSMS(slog.LevelWarn, "IMS inbound SMS decode failed", request,
-			"stage", "mime", "error", err)
-		session.sendLoggedDeliveryReport(request, buildRPError(0, 95), "rp_error")
-		return
-	}
-	rpdu, err := parseRPDU(payload)
-	if err != nil {
-		reference := byte(0)
-		if len(payload) > 1 {
-			reference = payload[1]
-		}
-		session.logInboundSMS(slog.LevelWarn, "IMS inbound SMS decode failed", request,
-			"stage", "rpdu", "payload_source", payloadSource,
-			"rp_reference", int(reference), "payload_bytes", len(payload), "error", err)
-		session.sendLoggedDeliveryReport(request, buildRPError(reference, 95), "rp_error")
+		session.sendDeliveryReport(request, buildRPError(0, 95))
 		return
 	}
 	if rpdu.messageType != 1 { // RP-DATA, network to MS.
-		session.logInboundSMS(slog.LevelInfo, "IMS inbound SMS control message received", request,
-			"stage", "rpdu", "payload_source", payloadSource,
-			"rp_message_type", int(rpdu.messageType), "rp_reference", int(rpdu.reference))
 		return
 	}
 	message, err := device.DecodeSMSDeliverTPDU(rpdu.tpdu)
 	if err != nil {
-		session.logInboundSMS(slog.LevelWarn, "IMS inbound SMS decode failed", request,
-			"stage", "tpdu", "payload_source", payloadSource,
-			"rp_reference", int(rpdu.reference), "tpdu_bytes", len(rpdu.tpdu), "error", err)
-		session.sendLoggedDeliveryReport(request, buildRPError(rpdu.reference, 95), "rp_error")
+		session.sendDeliveryReport(request, buildRPError(rpdu.reference, 95))
 		return
 	}
 	receivedAt := time.Now().UTC()
 	callID := strings.TrimSpace(request.value("Call-ID"))
 	if message.Direction == device.SMSDirectionStatusReport {
 		if message.MessageReference == nil || message.StatusCode == nil {
-			session.logInboundSMS(slog.LevelWarn, "IMS inbound SMS status report is incomplete", request,
-				"stage", "tpdu", "rp_reference", int(rpdu.reference))
-			session.sendLoggedDeliveryReport(request, buildRPError(rpdu.reference, 95), "rp_error")
+			session.sendDeliveryReport(request, buildRPError(rpdu.reference, 95))
 			return
 		}
 		status := ReceivedSMSStatus{
@@ -467,7 +357,7 @@ func (session *Session) processSMSMessage(request *sipRequest) {
 			Timestamp:              receivedAt,
 			RPReference:            int(rpdu.reference),
 			CallID:                 callID,
-			RawRPDU:                strings.ToUpper(hex.EncodeToString(payload)),
+			RawRPDU:                strings.ToUpper(hex.EncodeToString(request.Body)),
 			RawTPDU:                strings.ToUpper(hex.EncodeToString(rpdu.tpdu)),
 		}
 		if session.provider.config.OnSMSStatus != nil {
@@ -476,21 +366,14 @@ func (session *Session) processSMSMessage(request *sipRequest) {
 			cancel()
 		}
 		if err != nil {
-			session.logInboundSMS(slog.LevelWarn, "IMS inbound SMS status persistence failed", request,
-				"stage", "status_callback", "rp_reference", int(rpdu.reference), "error", err)
-			session.sendLoggedDeliveryReport(request, buildRPError(rpdu.reference, 22), "rp_error")
+			session.sendDeliveryReport(request, buildRPError(rpdu.reference, 22))
 			return
 		}
-		session.logInboundSMS(slog.LevelInfo, "IMS inbound SMS status report processed", request,
-			"stage", "status_callback", "rp_reference", int(rpdu.reference),
-			"status_code", *message.StatusCode)
-		session.sendLoggedDeliveryReport(request, []byte{0x02, rpdu.reference}, "rp_ack")
+		session.sendDeliveryReport(request, []byte{0x02, rpdu.reference})
 		return
 	}
 	if message.Direction != device.SMSDirectionReceived {
-		session.logInboundSMS(slog.LevelWarn, "IMS inbound SMS has unexpected TPDU direction", request,
-			"stage", "tpdu", "rp_reference", int(rpdu.reference), "direction", message.Direction)
-		session.sendLoggedDeliveryReport(request, buildRPError(rpdu.reference, 95), "rp_error")
+		session.sendDeliveryReport(request, buildRPError(rpdu.reference, 95))
 		return
 	}
 	var serviceCenterTimestamp *time.Time
@@ -513,7 +396,7 @@ func (session *Session) processSMSMessage(request *sipRequest) {
 		Concat:                 message.Concat,
 		RPReference:            int(rpdu.reference),
 		CallID:                 callID,
-		RawRPDU:                strings.ToUpper(hex.EncodeToString(payload)),
+		RawRPDU:                strings.ToUpper(hex.EncodeToString(request.Body)),
 		RawTPDU:                strings.ToUpper(hex.EncodeToString(rpdu.tpdu)),
 	}
 	if session.provider.config.OnSMS != nil {
@@ -522,130 +405,26 @@ func (session *Session) processSMSMessage(request *sipRequest) {
 		cancel()
 	}
 	if err != nil {
-		session.logInboundSMS(slog.LevelWarn, "IMS inbound SMS persistence failed", request,
-			"stage", "sms_callback", "rp_reference", int(rpdu.reference), "error", err)
-		session.sendLoggedDeliveryReport(request, buildRPError(rpdu.reference, 22), "rp_error")
+		session.sendDeliveryReport(request, buildRPError(rpdu.reference, 22))
 		return
 	}
-	session.logInboundSMS(slog.LevelInfo, "IMS inbound SMS processed", request,
-		"stage", "sms_callback", "payload_source", payloadSource,
-		"rp_reference", int(rpdu.reference), "encoding", message.Encoding,
-		"concatenated", message.Concat != nil)
-	session.sendLoggedDeliveryReport(request, []byte{0x02, rpdu.reference}, "rp_ack")
+	session.sendDeliveryReport(request, []byte{0x02, rpdu.reference})
 }
 
-func extractSMSPayload(request *sipRequest) ([]byte, string, error) {
-	if request == nil {
-		return nil, "", errors.New("ims: SMS MESSAGE is nil")
-	}
-	mediaType, parameters, err := mime.ParseMediaType(strings.TrimSpace(request.value("Content-Type")))
-	if err != nil {
-		return nil, "", fmt.Errorf("ims: parse SMS Content-Type: %w", err)
-	}
-	if strings.EqualFold(mediaType, smsContentType) {
-		payload, decodeErr := decodeSMSTransfer(request.Body, request.value("Content-Transfer-Encoding"))
-		return payload, smsContentType, decodeErr
-	}
-	if !strings.EqualFold(mediaType, "multipart/mixed") {
-		return nil, "", fmt.Errorf("ims: unsupported SMS Content-Type %q", mediaType)
-	}
-	boundary := strings.TrimSpace(parameters["boundary"])
-	if boundary == "" {
-		return nil, "", errors.New("ims: multipart SMS has no boundary")
-	}
-	reader := multipart.NewReader(bytes.NewReader(request.Body), boundary)
-	for {
-		part, nextErr := reader.NextRawPart()
-		if errors.Is(nextErr, io.EOF) {
-			break
-		}
-		if nextErr != nil {
-			return nil, "", fmt.Errorf("ims: read multipart SMS: %w", nextErr)
-		}
-		partType, _, parseErr := mime.ParseMediaType(strings.TrimSpace(part.Header.Get("Content-Type")))
-		if parseErr != nil || !strings.EqualFold(partType, smsContentType) {
-			_ = part.Close()
-			continue
-		}
-		body, readErr := io.ReadAll(part)
-		_ = part.Close()
-		if readErr != nil {
-			return nil, "", fmt.Errorf("ims: read multipart SMS payload: %w", readErr)
-		}
-		payload, decodeErr := decodeSMSTransfer(body, part.Header.Get("Content-Transfer-Encoding"))
-		return payload, "multipart/mixed", decodeErr
-	}
-	return nil, "", errors.New("ims: multipart MESSAGE omitted application/vnd.3gpp.sms payload")
-}
-
-func decodeSMSTransfer(body []byte, encoding string) ([]byte, error) {
-	switch strings.ToLower(strings.TrimSpace(encoding)) {
-	case "", "binary", "8bit":
-		return append([]byte(nil), body...), nil
-	case "base64":
-		decoded, err := io.ReadAll(base64.NewDecoder(base64.StdEncoding, bytes.NewReader(body)))
-		if err != nil {
-			return nil, fmt.Errorf("ims: decode base64 SMS payload: %w", err)
-		}
-		return decoded, nil
-	case "quoted-printable":
-		decoded, err := io.ReadAll(quotedprintable.NewReader(bytes.NewReader(body)))
-		if err != nil {
-			return nil, fmt.Errorf("ims: decode quoted-printable SMS payload: %w", err)
-		}
-		return decoded, nil
-	default:
-		return nil, fmt.Errorf("ims: unsupported SMS Content-Transfer-Encoding %q", encoding)
-	}
-}
-
-func (session *Session) logInboundSMS(level slog.Level, message string, request *sipRequest, attributes ...any) {
-	logger := slog.Default()
-	if session != nil && session.provider != nil && session.provider.config.Logger != nil {
-		logger = session.provider.config.Logger
-	}
-	base := []any{"device_id", session.request.DeviceID}
-	if request != nil {
-		base = append(base,
-			"call_id", strings.TrimSpace(request.value("Call-ID")),
-			"content_type", strings.TrimSpace(request.value("Content-Type")),
-			"body_bytes", len(request.Body),
-		)
-	}
-	logger.Log(context.Background(), level, message, append(base, attributes...)...)
-}
-
-func (session *Session) sendLoggedDeliveryReport(request *sipRequest, report []byte, reportType string) {
-	if err := session.sendDeliveryReport(request, report); err != nil {
-		session.logInboundSMS(slog.LevelWarn, "IMS inbound SMS delivery report failed", request,
-			"stage", "delivery_report", "report_type", reportType, "error", err)
-		return
-	}
-	session.logInboundSMS(slog.LevelDebug, "IMS inbound SMS delivery report sent", request,
-		"stage", "delivery_report", "report_type", reportType)
-}
-
-func (session *Session) sendDeliveryReport(request *sipRequest, report []byte) error {
+func (session *Session) sendDeliveryReport(request *sipRequest, report []byte) {
 	target := firstURI(request.value("P-Asserted-Identity"))
 	if target == "" {
 		target = firstURI(request.value("From"))
 	}
 	if target == "" {
-		return errors.New("ims: SMS MESSAGE omitted a delivery-report target")
+		return
 	}
-	response, err := session.sendSIPMessage(
+	_, _ = session.sendSIPMessage(
 		context.Background(),
 		target,
 		report,
 		strings.TrimSpace(request.value("Call-ID")),
 	)
-	if err != nil {
-		return err
-	}
-	if response.StatusCode < 200 || response.StatusCode >= 300 {
-		return fmt.Errorf("ims: SMS delivery report returned SIP %d", response.StatusCode)
-	}
-	return nil
 }
 
 func (session *Session) SendSMS(ctx context.Context, request vowifi.SMSSubmitRequest) (vowifi.SMSSubmitResult, error) {
@@ -662,21 +441,14 @@ func (session *Session) SendSMS(ctx context.Context, request vowifi.SMSSubmitReq
 	}
 	smsc := strings.TrimSpace(session.request.Identity.SMSC)
 	session.mu.Unlock()
-	smscSource := "sim"
 	if smsc == "" {
-		smscSource = "sim_reader"
 		reader, ok := session.provider.aka.(smsCenterReader)
 		var readErr error
 		if ok {
 			smsc, readErr = reader.ReadSMSCenter(ctx, session.request.DeviceID)
 		}
-		if strings.TrimSpace(smsc) == "" {
-			smsc = smsCenterForIdentity(session.provider.config, session.request.Identity)
-			smscSource = "plmn_fallback"
-		}
 		if strings.TrimSpace(smsc) == "" {
 			smsc = session.provider.config.SMSCenter
-			smscSource = "configured_fallback"
 		}
 		if strings.TrimSpace(smsc) == "" {
 			return vowifi.SMSSubmitResult{}, errors.Join(ErrSMSCUnavailable, readErr)
@@ -699,9 +471,6 @@ func (session *Session) SendSMS(ctx context.Context, request vowifi.SMSSubmitReq
 		SubmissionStatus: "pending",
 		PartResults:      make([]vowifi.SMSSubmitPart, 0, len(parts)),
 	}
-	session.logOutboundSMS(slog.LevelInfo, "IMS outbound SMS submission started",
-		"stage", "prepare", "parts", len(parts), "smsc_source", smscSource,
-		"recipient_type", smsRecipientType(parts[0].To))
 	psi := "tel:" + normalizeE164(smsc)
 	for _, part := range parts {
 		reference := session.allocateRPReference()
@@ -732,60 +501,19 @@ func (session *Session) SendSMS(ctx context.Context, request vowifi.SMSSubmitReq
 		}
 		result.PartResults = append(result.PartResults, partResult)
 		if sendErr != nil {
-			session.logOutboundSMS(slog.LevelWarn, "IMS outbound SMS submission failed",
-				"stage", "sip_transaction", "part", part.Part,
-				"rp_reference", int(reference), "error", sendErr)
 			result.SubmissionStatus = "failed"
 			return result, sendErr
 		}
 		if !partResult.Accepted {
-			session.logOutboundSMS(slog.LevelWarn, "IMS outbound SMS was rejected",
-				"stage", "sip_response", "part", part.Part,
-				"rp_reference", int(reference), "sip_status", response.StatusCode)
 			result.SubmissionStatus = "rejected"
 			return result, fmt.Errorf("%w: SIP %d", ErrSMSRejected, response.StatusCode)
 		}
 	}
 	result.AllPartsAccepted = true
 	result.SubmissionStatus = "accepted_by_ims"
-	session.logOutboundSMS(slog.LevelInfo, "IMS outbound SMS submission accepted",
-		"stage", "sip_response", "parts", result.PartsAccepted)
 	return result, nil
 }
 
-func smsCenterForIdentity(config Config, identity vowifi.SIMIdentity) string {
-	plmn := strings.TrimSpace(identity.HomeMCC) + strings.TrimSpace(identity.HomeMNC)
-	return strings.TrimSpace(config.SMSCenterByPLMN[plmn])
-}
-
-func smsRecipientType(recipient string) string {
-	recipient = strings.TrimSpace(recipient)
-	digits := strings.TrimPrefix(recipient, "+")
-	switch {
-	case strings.HasPrefix(recipient, "+"):
-		return "international"
-	case len(digits) <= 6:
-		return "short_code"
-	default:
-		return "national"
-	}
-}
-
-func (session *Session) logOutboundSMS(level slog.Level, message string, attributes ...any) {
-	logger := slog.Default()
-	if session != nil && session.provider != nil && session.provider.config.Logger != nil {
-		logger = session.provider.config.Logger
-	}
-	plmn := strings.TrimSpace(session.request.Identity.HomeMCC) + strings.TrimSpace(session.request.Identity.HomeMNC)
-	base := []any{
-		"device_id", session.request.DeviceID,
-		"home_plmn", plmn,
-		"transport", session.transport,
-		"security", session.effectiveSecurityMode(),
-	}
-	logger.Log(context.Background(), level, message, append(base, attributes...)...)
-}
-
 func (session *Session) allocateRPReference() byte {
 	session.mu.Lock()
 	defer session.mu.Unlock()
@@ -839,8 +567,6 @@ func (session *Session) sendSIPMessage(
 		fmt.Sprintf("CSeq: %d MESSAGE", cseq),
 		"P-Preferred-Identity: <"+session.identity.public+">",
 		"Accept-Contact: *;+g.3gpp.smsip",
-		"Request-Disposition: no-fork",
-		"Allow: MESSAGE",
 	)
 	if inReplyTo != "" {
 		lines = append(lines, "In-Reply-To: "+inReplyTo)
@@ -852,23 +578,7 @@ func (session *Session) sendSIPMessage(
 		"", "",
 	)
 	request := append([]byte(strings.Join(lines, "\r\n")), body...)
-	session.logOutboundSMS(slog.LevelDebug, "IMS SIP MESSAGE transaction started",
-		"stage", "sip_send", "call_id", callID, "cseq", cseq,
-		"body_bytes", len(body), "service_routes", len(serviceRoutes))
-	response, exchangeErr := session.exchangeRuntime(
-		ctx,
-		request,
-		sipTransactionKey{callID: callID, cseq: cseq, method: "MESSAGE"},
-	)
-	if exchangeErr != nil {
-		session.logOutboundSMS(slog.LevelWarn, "IMS SIP MESSAGE transaction failed",
-			"stage", "sip_transaction", "call_id", callID, "cseq", cseq, "error", exchangeErr)
-		return response, exchangeErr
-	}
-	session.logOutboundSMS(slog.LevelDebug, "IMS SIP MESSAGE response received",
-		"stage", "sip_response", "call_id", callID, "cseq", cseq,
-		"sip_status", response.StatusCode)
-	return response, nil
+	return session.exchangeRuntime(ctx, request, sipTransactionKey{callID: callID, cseq: cseq, method: "MESSAGE"})
 }
 
 func runtimeSecurityHeaders(active bool, verifyValue string) []string {

internal/vowifi/ims/sms_runtime_test.go

@@ -1,14 +1,11 @@
 package ims
 
 import (
-	"bytes"
 	"context"
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"mime/multipart"
 	"net"
-	"net/textproto"
 	"strings"
 	"testing"
 	"time"
@@ -103,111 +100,6 @@ func TestRuntimeSecurityHeaders(t *testing.T) {
 	}
 }
 
-func TestExtractSMSPayload(t *testing.T) {
-	rpdu := []byte{0x01, 0x2a, 0x00, 0x00, 0x03, 0x04, 0x00, 0x00}
-	tests := []struct {
-		name        string
-		request     *sipRequest
-		wantSource  string
-		wantPayload []byte
-	}{
-		{
-			name: "direct binary",
-			request: &sipRequest{Headers: map[string][]string{
-				"content-type":              {smsContentType + "; charset=binary"},
-				"content-transfer-encoding": {"binary"},
-			}, Body: rpdu},
-			wantSource:  smsContentType,
-			wantPayload: rpdu,
-		},
-		{
-			name:        "multipart base64",
-			request:     multipartSMSRequest(t, rpdu),
-			wantSource:  "multipart/mixed",
-			wantPayload: rpdu,
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			payload, source, err := extractSMSPayload(test.request)
-			if err != nil {
-				t.Fatalf("extractSMSPayload() error = %v", err)
-			}
-			if source != test.wantSource || !bytes.Equal(payload, test.wantPayload) {
-				t.Fatalf("extractSMSPayload() = (%x, %q), want (%x, %q)",
-					payload, source, test.wantPayload, test.wantSource)
-			}
-		})
-	}
-}
-
-func TestSupportsSMSContentType(t *testing.T) {
-	for _, test := range []struct {
-		value string
-		want  bool
-	}{
-		{smsContentType, true},
-		{"Application/Vnd.3gpp.Sms; charset=binary", true},
-		{`multipart/mixed; boundary="vodafone-boundary"`, true},
-		{"multipart/mixed", false},
-		{"text/plain", false},
-	} {
-		if got := supportsSMSContentType(test.value); got != test.want {
-			t.Errorf("supportsSMSContentType(%q) = %v, want %v", test.value, got, test.want)
-		}
-	}
-}
-
-func TestSMSCenterForIdentityUsesExactPLMN(t *testing.T) {
-	config := Config{SMSCenterByPLMN: map[string]string{
-		"23410":  "+447802000332",
-		"234010": "+447802000332",
-		"23415":  "+447785016005",
-	}}
-	for _, test := range []struct {
-		mnc  string
-		want string
-	}{
-		{mnc: "10", want: "+447802000332"},
-		{mnc: "010", want: "+447802000332"},
-		{mnc: "15", want: "+447785016005"},
-		{mnc: "30", want: ""},
-	} {
-		identity := vowifi.SIMIdentity{HomeMCC: "234", HomeMNC: test.mnc}
-		if got := smsCenterForIdentity(config, identity); got != test.want {
-			t.Errorf("smsCenterForIdentity(234/%s) = %q, want %q", test.mnc, got, test.want)
-		}
-	}
-}
-
-func multipartSMSRequest(t *testing.T, payload []byte) *sipRequest {
-	t.Helper()
-	var body bytes.Buffer
-	writer := multipart.NewWriter(&body)
-	if err := writer.SetBoundary("vodafone-boundary"); err != nil {
-		t.Fatal(err)
-	}
-	header := make(textproto.MIMEHeader)
-	header.Set("Content-Type", smsContentType)
-	header.Set("Content-Transfer-Encoding", "base64")
-	part, err := writer.CreatePart(header)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err = part.Write([]byte(base64.StdEncoding.EncodeToString(payload))); err != nil {
-		t.Fatal(err)
-	}
-	if err = writer.Close(); err != nil {
-		t.Fatal(err)
-	}
-	return &sipRequest{
-		Headers: map[string][]string{
-			"content-type": {`multipart/mixed; boundary="vodafone-boundary"`},
-		},
-		Body: body.Bytes(),
-	}
-}
-
 func TestSessionSendsSMSOverIMS(t *testing.T) {
 	listener, err := net.ListenUDP("udp", &net.UDPAddr{IP: net.ParseIP("127.0.0.1")})
 	if err != nil {
@@ -310,24 +202,6 @@ func serveInboundSMS(listener *net.UDPConn, nonce string, readyForClose chan<- s
 	}
 	rpdu := []byte{0x01, 0x2a, 0x00, 0x00, byte(len(tpdu))}
 	rpdu = append(rpdu, tpdu...)
-	var messageBody bytes.Buffer
-	mimeWriter := multipart.NewWriter(&messageBody)
-	if err = mimeWriter.SetBoundary("vodafone-delivery"); err != nil {
-		return err
-	}
-	mimeHeader := make(textproto.MIMEHeader)
-	mimeHeader.Set("Content-Type", smsContentType)
-	mimeHeader.Set("Content-Transfer-Encoding", "binary")
-	mimePart, createErr := mimeWriter.CreatePart(mimeHeader)
-	if createErr != nil {
-		return createErr
-	}
-	if _, err = mimePart.Write(rpdu); err != nil {
-		return err
-	}
-	if err = mimeWriter.Close(); err != nil {
-		return err
-	}
 	request := []byte(strings.Join([]string{
 		"MESSAGE sip:[email protected] SIP/2.0",
 		"Via: SIP/2.0/UDP " + listener.LocalAddr().String() + ";branch=z9hG4bKdeliver",
@@ -336,10 +210,10 @@ func serveInboundSMS(listener *net.UDPConn, nonce string, readyForClose chan<- s
 		"P-Asserted-Identity: <sip:[email protected]>",
 		"Call-ID: network-deliver-1",
 		"CSeq: 1 MESSAGE",
-		`Content-Type: multipart/mixed; boundary="vodafone-delivery"`,
-		fmt.Sprintf("Content-Length: %d", messageBody.Len()), "", "",
+		"Content-Type: application/vnd.3gpp.sms",
+		fmt.Sprintf("Content-Length: %d", len(rpdu)), "", "",
 	}, "\r\n"))
-	request = append(request, messageBody.Bytes()...)
+	request = append(request, rpdu...)
 	if _, err = listener.WriteToUDP(request, remote); err != nil {
 		return err
 	}
@@ -418,25 +292,12 @@ func serveOutboundSMS(listener *net.UDPConn, nonce string, readyForClose chan<-
 	if err != nil {
 		return err
 	}
-	firstMessage := append([]byte(nil), packet[:count]...)
-	firstRemote := remote.String()
-	// Exercise the RFC SIP/UDP non-INVITE transaction retransmission path by
-	// deliberately dropping the first MESSAGE request.
-	count, remote, err = listener.ReadFromUDP(packet)
-	if err != nil {
-		return err
-	}
-	if remote.String() != firstRemote || !bytes.Equal(packet[:count], firstMessage) {
-		return errors.New("outbound MESSAGE retransmission changed transaction bytes or source")
-	}
 	message, err := parseSIPPacket(packet[:count])
 	if err != nil || message.Request == nil {
 		return fmt.Errorf("outbound MESSAGE parse: %v", err)
 	}
 	if message.Request.Method != "MESSAGE" || message.Request.URI != "tel:+447785016005" ||
-		strings.ToLower(message.Request.value("Content-Type")) != smsContentType ||
-		message.Request.value("Request-Disposition") != "no-fork" ||
-		message.Request.value("Allow") != "MESSAGE" {
+		strings.ToLower(message.Request.value("Content-Type")) != smsContentType {
 		return fmt.Errorf("unexpected outbound MESSAGE %#v", message.Request)
 	}
 	rpdu, err := parseRPDU(message.Request.Body)

internal/vowifi/integration/store.go

@@ -28,37 +28,21 @@ func (resolver ProxyResolver) Resolve(
 	}
 	deviceID := strings.TrimSpace(request.DeviceID)
 	iccid := strings.TrimSpace(request.ICCID)
-	if deviceID == "" {
+	if deviceID == "" || iccid == "" {
 		return vowifi.ProxyRoute{Mode: vowifi.ProxyModeDirect}, nil
 	}
-	var upstreamID string
-	if iccid != "" {
-		binding, err := resolver.Store.DeviceProxyBinding(ctx, iccid)
-		if err == nil {
-			upstreamID = binding.UpstreamProxyID
-		} else if !errors.Is(err, store.ErrNotFound) {
-			return vowifi.ProxyRoute{}, fmt.Errorf("resolve proxy binding for ICCID %s: %w", iccid, err)
-		}
+	binding, err := resolver.Store.DeviceProxyBinding(ctx, iccid)
+	if errors.Is(err, store.ErrNotFound) {
+		return vowifi.ProxyRoute{Mode: vowifi.ProxyModeDirect}, nil
 	}
-	if upstreamID == "" {
-		country, found := device.CountryForMCC(strings.TrimSpace(request.HomeMCC))
-		if !found {
-			return vowifi.ProxyRoute{Mode: vowifi.ProxyModeDirect}, nil
-		}
-		rule, ruleErr := resolver.Store.CountryRule(ctx, country)
-		if errors.Is(ruleErr, store.ErrNotFound) || (ruleErr == nil && !rule.Enabled) {
-			return vowifi.ProxyRoute{Mode: vowifi.ProxyModeDirect}, nil
-		}
-		if ruleErr != nil {
-			return vowifi.ProxyRoute{}, fmt.Errorf("resolve proxy country rule for MCC %s: %w", request.HomeMCC, ruleErr)
-		}
-		upstreamID = rule.UpstreamProxyID
+	if err != nil {
+		return vowifi.ProxyRoute{}, fmt.Errorf("resolve proxy binding for ICCID %s: %w", iccid, err)
 	}
-	upstream, err := resolver.Store.UpstreamProxy(ctx, upstreamID)
+	upstream, err := resolver.Store.UpstreamProxy(ctx, binding.UpstreamProxyID)
 	if err != nil {
 		return vowifi.ProxyRoute{}, fmt.Errorf(
 			"load upstream proxy %q for device %s: %w",
-			upstreamID,
+			binding.UpstreamProxyID,
 			deviceID,
 			err,
 		)

internal/vowifi/integration/store_test.go

@@ -79,7 +79,7 @@ func TestProxyResolverDoesNotLeakBindingToAnotherProfileOnSameDevice(t *testing.
 	}
 }
 
-func TestProxyResolverUsesCountryRuleWithoutICCIDBinding(t *testing.T) {
+func TestProxyResolverDoesNotUseCountryRuleWithoutDeviceBinding(t *testing.T) {
 	database := testStore(t)
 	if err := database.UpsertUpstreamProxy(context.Background(), store.UpstreamProxy{
 		ID: "legacy", Name: "Legacy", Addr: "127.0.0.1:1080", Enabled: true,
@@ -98,42 +98,8 @@ func TestProxyResolverUsesCountryRuleWithoutICCIDBinding(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if route.Mode != vowifi.ProxyModeSOCKS5 || route.ID != "legacy" {
-		t.Fatalf("route = %#v, want MCC country fallback", route)
-	}
-}
-
-func TestProxyResolverPrefersICCIDBindingOverCountryRule(t *testing.T) {
-	database := testStore(t)
-	for _, proxy := range []store.UpstreamProxy{
-		{ID: "profile", Name: "Profile", Addr: "127.0.0.1:1080", Enabled: true},
-		{ID: "country", Name: "Country", Addr: "127.0.0.1:1081", Enabled: true},
-	} {
-		if err := database.UpsertUpstreamProxy(context.Background(), proxy); err != nil {
-			t.Fatal(err)
-		}
-	}
-	if err := database.UpsertCountryRule(context.Background(), store.CountryRule{
-		CountryCode: "GB", CountryName: "United Kingdom", UpstreamProxyID: "country", Enabled: true,
-	}); err != nil {
-		t.Fatal(err)
-	}
-	if err := database.UpsertDevice(context.Background(), store.Device{ID: "ec20", Name: "EC20"}); err != nil {
-		t.Fatal(err)
-	}
-	if err := database.UpsertDeviceProxyBinding(context.Background(), store.DeviceProxyBinding{
-		DeviceID: "ec20", ICCID: "89441000400128014257", ProfileName: "Physical SIM", UpstreamProxyID: "profile",
-	}); err != nil {
-		t.Fatal(err)
-	}
-	route, err := (ProxyResolver{Store: database}).Resolve(context.Background(), vowifi.ProxyRequest{
-		DeviceID: "ec20", ICCID: "89441000400128014257", HomeMCC: "234",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if route.ID != "profile" {
-		t.Fatalf("route = %#v, want ICCID binding", route)
+	if route.Mode != vowifi.ProxyModeDirect {
+		t.Fatalf("route = %#v, want direct", route)
 	}
 }
 

internal/vowifi/native_qmi_adapter.go

@@ -1,169 +0,0 @@
-package vowifi
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"strings"
-	"sync"
-)
-
-// NativeQMIController is implemented by device.Manager. It exposes only the
-// QMI UIM/DMS/NAS primitives needed by VoWiFi and keeps transport ownership in
-// the device layer.
-type NativeQMIController interface {
-	ReadNativeQMIIdentity(context.Context, string) (iccid, imsi, imei, mcc, mnc string, err error)
-	ProbeNativeQMIApplication(context.Context, string, string) ([]byte, string, error)
-	AuthenticateNativeQMI(context.Context, string, []byte, []byte) ([]byte, error)
-	NativeQMIRadioSnapshot(context.Context, string) (mode int, psAttached bool, err error)
-	StopNativeQMICellularData(context.Context, string) error
-	SetNativeQMIRadioOff(context.Context, string, bool) error
-}
-
-type NativeQMIAdapter struct {
-	controller         NativeQMIController
-	pureAirplanePolicy func(string) bool
-	mu                 sync.Mutex
-	bindings           map[string]nativeQMIBinding
-}
-
-type nativeQMIBinding struct {
-	deviceID    string
-	iccid       string
-	imsi        string
-	aid         []byte
-	application string
-}
-
-var _ SIMIdentityReader = (*NativeQMIAdapter)(nil)
-var _ PreferredAKAProvider = (*NativeQMIAdapter)(nil)
-var _ RadioController = (*NativeQMIAdapter)(nil)
-
-func NewNativeQMIAdapter(controller NativeQMIController, purePolicy func(string) bool) (*NativeQMIAdapter, error) {
-	if controller == nil {
-		return nil, errors.New("vocat: native QMI controller is required")
-	}
-	return &NativeQMIAdapter{controller: controller, pureAirplanePolicy: purePolicy, bindings: make(map[string]nativeQMIBinding)}, nil
-}
-
-func (adapter *NativeQMIAdapter) ReadIdentity(ctx context.Context, deviceID string) (SIMIdentity, error) {
-	deviceID = strings.TrimSpace(deviceID)
-	if deviceID == "" {
-		return SIMIdentity{}, errors.New("vocat: native QMI device ID is required")
-	}
-	iccid, imsi, imei, mcc, mnc, err := adapter.controller.ReadNativeQMIIdentity(ctx, deviceID)
-	if err != nil {
-		return SIMIdentity{}, err
-	}
-	identity := applyAssignedCarrierRoute(SIMIdentity{ICCID: strings.TrimSpace(iccid), IMSI: strings.TrimSpace(imsi), IMEI: strings.TrimSpace(imei), HomeMCC: strings.TrimSpace(mcc), HomeMNC: strings.TrimSpace(mnc)})
-	if err := identity.validate(); err != nil {
-		return SIMIdentity{}, err
-	}
-	adapter.mu.Lock()
-	adapter.bindings[identity.ICCID] = nativeQMIBinding{deviceID: deviceID, iccid: identity.ICCID, imsi: identity.IMSI}
-	adapter.mu.Unlock()
-	return identity, nil
-}
-
-func (adapter *NativeQMIAdapter) binding(identity SIMIdentity) (nativeQMIBinding, error) {
-	adapter.mu.Lock()
-	binding, ok := adapter.bindings[strings.TrimSpace(identity.ICCID)]
-	adapter.mu.Unlock()
-	if !ok {
-		return nativeQMIBinding{}, errors.New("vocat: native QMI SIM identity is not bound to a device")
-	}
-	if binding.imsi != strings.TrimSpace(identity.IMSI) {
-		return nativeQMIBinding{}, ErrEC20IdentityChanged
-	}
-	return binding, nil
-}
-
-func (adapter *NativeQMIAdapter) verify(ctx context.Context, binding nativeQMIBinding) error {
-	iccid, imsi, _, _, _, err := adapter.controller.ReadNativeQMIIdentity(ctx, binding.deviceID)
-	if err != nil {
-		return err
-	}
-	if strings.TrimSpace(iccid) != binding.iccid || strings.TrimSpace(imsi) != binding.imsi {
-		return ErrEC20IdentityChanged
-	}
-	return nil
-}
-
-func (adapter *NativeQMIAdapter) CheckReady(ctx context.Context, identity SIMIdentity) (AKAEvidence, error) {
-	binding, err := adapter.binding(identity)
-	if err != nil {
-		return AKAEvidence{}, err
-	}
-	if err := adapter.verify(ctx, binding); err != nil {
-		return AKAEvidence{}, err
-	}
-	aid, application, err := adapter.controller.ProbeNativeQMIApplication(ctx, binding.deviceID, "")
-	if err != nil {
-		return AKAEvidence{}, fmt.Errorf("%w: %v", ErrEC20ApplicationAbsent, err)
-	}
-	binding.aid, binding.application = append([]byte(nil), aid...), application
-	adapter.mu.Lock()
-	adapter.bindings[binding.iccid] = binding
-	adapter.mu.Unlock()
-	return AKAEvidence{Ready: true, Application: application}, nil
-}
-
-func (adapter *NativeQMIAdapter) Authenticate(ctx context.Context, identity SIMIdentity, challenge AKAChallenge) (AKAResult, error) {
-	return adapter.AuthenticateWithPreference(ctx, identity, challenge, "")
-}
-
-func (adapter *NativeQMIAdapter) AuthenticateWithPreference(ctx context.Context, identity SIMIdentity, challenge AKAChallenge, preference string) (AKAResult, error) {
-	binding, err := adapter.binding(identity)
-	if err != nil {
-		return AKAResult{}, err
-	}
-	strictISIM := strings.EqualFold(strings.TrimSpace(preference), "isim_strict")
-	if len(binding.aid) == 0 || (strictISIM && binding.application != "ISIM") {
-		aid, application, probeErr := adapter.controller.ProbeNativeQMIApplication(ctx, binding.deviceID, preference)
-		if probeErr != nil {
-			return AKAResult{}, fmt.Errorf("%w: %v", ErrEC20ApplicationAbsent, probeErr)
-		}
-		binding.aid, binding.application = append([]byte(nil), aid...), application
-		adapter.mu.Lock()
-		adapter.bindings[binding.iccid] = binding
-		adapter.mu.Unlock()
-	}
-	if strictISIM && binding.application != "ISIM" {
-		return AKAResult{}, ErrEC20ApplicationAbsent
-	}
-	if err := adapter.verify(ctx, binding); err != nil {
-		return AKAResult{}, err
-	}
-	raw, err := adapter.controller.AuthenticateNativeQMI(ctx, binding.deviceID, binding.aid, buildUSIMAuthenticateAPDU(challenge))
-	if err != nil {
-		return AKAResult{}, ErrEC20AKACommand
-	}
-	return parseUSIMAuthenticateResponse(raw)
-}
-
-func (adapter *NativeQMIAdapter) Snapshot(ctx context.Context, deviceID string) (RadioSnapshot, error) {
-	mode, attached, err := adapter.controller.NativeQMIRadioSnapshot(ctx, deviceID)
-	if err != nil {
-		return RadioSnapshot{}, err
-	}
-	pure := false
-	if adapter.pureAirplanePolicy != nil {
-		pure = adapter.pureAirplanePolicy(deviceID)
-	}
-	return RadioSnapshot{CellularDataEnabled: attached, OperatingMode: mode, PureAirplanePolicy: pure}, nil
-}
-
-func (adapter *NativeQMIAdapter) StopCellularData(ctx context.Context, deviceID string) error {
-	return adapter.controller.StopNativeQMICellularData(ctx, deviceID)
-}
-
-func (adapter *NativeQMIAdapter) EnterVoWiFiRFOff(ctx context.Context, deviceID string) error {
-	return adapter.controller.SetNativeQMIRadioOff(ctx, deviceID, true)
-}
-
-func (adapter *NativeQMIAdapter) Restore(ctx context.Context, deviceID string, snapshot RadioSnapshot) error {
-	// A user VoWiFi policy is fail-closed. Otherwise restore whether the modem
-	// was online, never a packet context that was detached for VoWiFi.
-	off := snapshot.PureAirplanePolicy || snapshot.OperatingMode != 1
-	return adapter.controller.SetNativeQMIRadioOff(ctx, deviceID, off)
-}

internal/vowifi/orchestrator.go

@@ -645,13 +645,18 @@ func DeriveEPDG(identity SIMIdentity) (string, error) {
 		}
 		return strings.ToLower(configured), nil
 	}
-	if IsATT310280(identity) {
-		return att310280EPDG, nil
-	}
 	if err := identity.validate(); err != nil {
 		return "", err
 	}
-	return standardEPDGHostname(identity.HomeMCC, identity.HomeMNC), nil
+	mnc := strings.TrimSpace(identity.HomeMNC)
+	for len(mnc) < 3 {
+		mnc = "0" + mnc
+	}
+	return fmt.Sprintf(
+		"epdg.epc.mnc%s.mcc%s.pub.3gppnetwork.org",
+		mnc,
+		strings.TrimSpace(identity.HomeMCC),
+	), nil
 }
 
 func normalizeProxyRoute(route ProxyRoute) (ProxyRoute, error) {

internal/vowifi/pcsc_adapter.go

@@ -53,18 +53,18 @@ func (adapter *PCSCAdapter) ReadIdentity(ctx context.Context, deviceID string) (
 	mncLength := identity.MNCLength
 	if mncLength != 2 && mncLength != 3 {
 		if mcc, mnc, ok := assignedHomePLMN(identity.IMSI); ok {
-			return applyAssignedCarrierRoute(SIMIdentity{ICCID: identity.ICCID, IMSI: identity.IMSI, HomeMCC: mcc, HomeMNC: mnc, SMSC: identity.SMSC}), nil
+			return SIMIdentity{ICCID: identity.ICCID, IMSI: identity.IMSI, HomeMCC: mcc, HomeMNC: mnc, SMSC: identity.SMSC}, nil
 		}
 		return SIMIdentity{}, ErrEC20MNCUnavailable
 	}
 	if len(identity.IMSI) < 3+mncLength {
 		return SIMIdentity{}, errors.New("vocat: USB SIM IMSI is shorter than its EF_AD home PLMN")
 	}
-	return applyAssignedCarrierRoute(SIMIdentity{
+	return SIMIdentity{
 		ICCID: identity.ICCID, IMSI: identity.IMSI,
 		HomeMCC: identity.IMSI[:3], HomeMNC: identity.IMSI[3 : 3+mncLength],
 		SMSC: identity.SMSC,
-	}), nil
+	}, nil
 }
 
 func (adapter *PCSCAdapter) ReadSMSCenter(ctx context.Context, deviceID string) (string, error) {

internal/vowifi/phone_test.go

@@ -125,16 +125,6 @@ func TestDeriveEPDGUsesExplicitPLMNAndNeverIMSIHeuristics(t *testing.T) {
 			},
 			want: "epdg.epc.mnc260.mcc310.pub.3gppnetwork.org",
 		},
-		{
-			name: "AT&T 310280 uses carrier endpoint",
-			identity: SIMIdentity{
-				ICCID:   "8901000000000000001",
-				IMSI:    "310280000000001",
-				HomeMCC: "310",
-				HomeMNC: "280",
-			},
-			want: "epdg.epc.att.net",
-		},
 		{
 			name: "explicit endpoint",
 			identity: SIMIdentity{

internal/vowifi/runtime/manager.go

@@ -56,7 +56,6 @@ type Manager struct {
 
 type entry struct {
 	orchestrator     *vowifi.Orchestrator
-	maintenance      bool
 	busy             bool
 	reconnectPending bool
 	disablePending   bool
@@ -67,36 +66,6 @@ type entry struct {
 	stopWatch        func()
 }
 
-// BeginMaintenance temporarily suppresses background enable requests while a
-// caller performs an exclusive SIM operation such as switching eSIM profiles.
-// Disable requests remain allowed so the current runtime can release QMI/UIM.
-func (manager *Manager) BeginMaintenance(deviceID string) error {
-	if err := manager.Ensure(manager.ctx, deviceID); err != nil {
-		return err
-	}
-	manager.mu.Lock()
-	defer manager.mu.Unlock()
-	if manager.closed {
-		return ErrClosed
-	}
-	item := manager.entries[deviceID]
-	if item == nil {
-		return ErrNotRegistered
-	}
-	item.maintenance = true
-	return nil
-}
-
-// EndMaintenance re-enables ordinary desired-state reconciliation. The caller
-// then applies the newly active profile's persisted policy.
-func (manager *Manager) EndMaintenance(deviceID string) {
-	manager.mu.Lock()
-	if item := manager.entries[deviceID]; item != nil {
-		item.maintenance = false
-	}
-	manager.mu.Unlock()
-}
-
 func New(options Options) *Manager {
 	if options.Logger == nil {
 		options.Logger = slog.Default()
@@ -241,11 +210,6 @@ func (manager *Manager) RequestEnabled(deviceID string, enabled bool) (vowifi.St
 	}
 	manager.mu.Lock()
 	item := manager.entries[deviceID]
-	if item.maintenance && enabled {
-		state := item.orchestrator.State()
-		manager.mu.Unlock()
-		return state, nil
-	}
 	item.desiredEnabled = enabled
 	if item.busy {
 		manager.logger.Info(

internal/vowifi/types.go

@@ -317,14 +317,6 @@ type AKAProvider interface {
 	Authenticate(context.Context, SIMIdentity, AKAChallenge) (AKAResult, error)
 }
 
-// PreferredAKAProvider optionally lets an AKA provider select a carrier-
-// provisioned application such as ISIM. Providers that only expose USIM keep
-// implementing AKAProvider unchanged.
-type PreferredAKAProvider interface {
-	AKAProvider
-	AuthenticateWithPreference(context.Context, SIMIdentity, AKAChallenge, string) (AKAResult, error)
-}
-
 // RadioController owns the host/modem radio projection. EnterVoWiFiRFOff must
 // not toggle the independent pure-airplane policy; Restore must return to the
 // captured pre-transaction state.

scripts/install.sh

@@ -298,18 +298,6 @@ detect_arch() {
 
 # --- Download + verify -------------------------------------------------------
 VOCAT_TMP=""
-
-# curl transfer options for the binary download. -f makes curl fail on HTTP
-# errors and -L follows the release-asset redirect. On an interactive terminal
-# we show a single-line progress bar so a multi-megabyte download gives visible
-# feedback; otherwise (piped, cron, systemd) we stay quiet but still surface
-# errors via -S.
-if [ -t 2 ]; then
-    CURL_DL_OPTS=(-fSL --progress-bar)
-else
-    CURL_DL_OPTS=(-fsSL)
-fi
-
 download_and_verify() {
     VOCAT_TMP=$(mktemp -d)
     trap 'rm -rf "$VOCAT_TMP"' EXIT
@@ -319,7 +307,7 @@ download_and_verify() {
         asset="vocat-linux-${ARCH_FALLBACK}"
     fi
     msg "下载 $asset ..." "Downloading $asset ..."
-    curl "${CURL_DL_OPTS[@]}" -o "${VOCAT_TMP}/vocat" "${base}/${asset}" || die "下载二进制失败。" "Failed to download the binary."
+    curl -fsSL -o "${VOCAT_TMP}/vocat" "${base}/${asset}" || die "下载二进制失败。" "Failed to download the binary."
     curl -fsSL -o "${VOCAT_TMP}/SHA256SUMS" "${base}/SHA256SUMS" || die "下载 SHA256SUMS 失败。" "Failed to download SHA256SUMS."
 
     local expected actual
@@ -357,14 +345,11 @@ FIRST_INSTALL=0
 INITIAL_ADMIN_PASSWORD=""
 
 bootstrap_admin() {
-    local candidate="${1:-$BINARY_PATH}"
     local secret result
     secret=$(od -An -N16 -tx1 /dev/urandom | tr -d ' \n')
     [ -n "$secret" ] || die "Failed to generate a random secret." "Failed to generate a random secret."
-    result=$(printf '%s\n' "$secret" | "$candidate" bootstrap-admin --database /opt/vocat/data/vocat.db --username admin) || \
-        die \
-            "待安装版本无法读取或升级现有数据库；当前程序尚未被替换，请检查数据库与版本兼容性。" \
-            "The candidate version cannot read or migrate the existing database; the installed program was not replaced. Check database and version compatibility."
+    result=$(printf '%s\n' "$secret" | "$BINARY_PATH" bootstrap-admin --database /opt/vocat/data/vocat.db --username admin) || \
+        die "Failed to initialize the administrator." "Failed to initialize the administrator."
     if [ "$result" = "created" ]; then
         FIRST_INSTALL=1
         INITIAL_ADMIN_PASSWORD="$secret"
@@ -547,12 +532,9 @@ fi
 resolve_target_version
 skip_if_equal
 download_and_verify
-ensure_data_dir
-# Validate the database with the downloaded binary before replacing the
-# installed program. In particular, a release with an older schema must never
-# overwrite a newer working binary and leave the service in a restart loop.
-bootstrap_admin "${VOCAT_TMP}/vocat"
 install_binary
+ensure_data_dir
+bootstrap_admin
 setup_env
 write_service
 enable_and_start

scripts/update-carriers.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
-"""Refresh VoCat's offline carrier table from Android's carrier database.
+"""Refresh VoCat's offline PLMN name table from Android's carrier database.
 
-The compact ``c`` map remains the MCC/MNC-only fallback.  The ``r`` list keeps
-Android's SIM-identity rules (IMSI, ICCID, SPN and GID) so travel eSIMs and
-MVNOs sharing an MNO's PLMN can be identified without hard-coded exceptions.
+The AOSP carrier ID table is maintained for Android's own carrier recognition.
+Only unconstrained MCC/MNC records are used here: MVNO matches that also require
+an SPN, IMSI prefix, GID or ICCID prefix must not rename the serving MNO.
 """
 
 from __future__ import annotations
@@ -125,61 +125,10 @@ def aosp_carriers(text: str) -> dict[str, str]:
     return carriers
 
 
-RULE_FIELDS = {
-    "mccmnc_tuple": "m",
-    "imsi_prefix_xpattern": "x",
-    "spn": "s",
-    "gid1": "g1",
-    "gid2": "g2",
-    "iccid_prefix": "i",
-}
-
-
-def textproto_strings(block: str, field: str) -> list[str]:
-    return [
-        json.loads(value)
-        for value in re.findall(
-            rf"^\s*{re.escape(field)}:\s*(\"(?:\\.|[^\"\\])*\")",
-            block,
-            re.M,
-        )
-    ]
-
-
-def aosp_identity_rules(text: str) -> list[dict[str, object]]:
-    """Return rules VoCat can evaluate using values read directly from a SIM.
-
-    Android combines different fields with AND and repeated values of one field
-    with OR. Rules that also require APN, PNN/PLMN or carrier certificates are
-    omitted until those inputs are available; treating an unavailable input as
-    a wildcard would incorrectly identify subscriptions.
-    """
-
-    supported = set(RULE_FIELDS)
-    rules: list[dict[str, object]] = []
-    for carrier in braced_blocks(text, "carrier_id"):
-        name = textproto_string(carrier, "carrier_name").strip()
-        if not name:
-            continue
-        for attribute in braced_blocks(carrier, "carrier_attribute"):
-            fields = set(re.findall(r"^\s*([a-zA-Z0-9_]+)\s*:", attribute, re.M))
-            if not fields.issubset(supported) or fields == {"mccmnc_tuple"}:
-                continue
-            rule: dict[str, object] = {"n": name}
-            for source_field, output_field in RULE_FIELDS.items():
-                values = textproto_strings(attribute, source_field)
-                if values:
-                    rule[output_field] = values
-            if rule.get("m"):
-                rules.append(rule)
-    return rules
-
-
 def main() -> None:
     with urllib.request.urlopen(SOURCE_URL, timeout=30) as response:
         source = base64.b64decode(response.read()).decode("utf-8")
     names = aosp_carriers(source)
-    identity_rules = aosp_identity_rules(source)
     table = json.loads(FRONTEND_TABLE.read_text(encoding="utf-8"))
     countries: dict[str, str] = table["i"]
     countries.update({str(mcc): "us" for mcc in range(310, 317)})
@@ -200,23 +149,19 @@ def main() -> None:
         "c": dict(sorted(carriers.items())),
         "i": dict(sorted(countries.items())),
         "t": sorted(set(table["t"])),
-        "r": identity_rules,
         "meta": {
             "source": "Android Open Source Project carrier_list.textpb",
             "source_url": SOURCE_URL.removesuffix("?format=TEXT"),
             "aosp_version": version_match.group(1) if version_match else "unknown",
             "aosp_generic_records": len(names),
-            "aosp_identity_rules": len(identity_rules),
         },
     }
-    frontend_encoded = json.dumps(output, ensure_ascii=False, indent=4) + "\n"
-    backend_encoded = json.dumps(output, ensure_ascii=False, separators=(",", ":")) + "\n"
-    FRONTEND_TABLE.write_text(frontend_encoded, encoding="utf-8", newline="\n")
-    BACKEND_TABLE.write_text(backend_encoded, encoding="utf-8", newline="\n")
+    encoded = json.dumps(output, ensure_ascii=False, separators=(",", ":")) + "\n"
+    FRONTEND_TABLE.write_text(encoded, encoding="utf-8", newline="\n")
+    BACKEND_TABLE.write_text(encoded, encoding="utf-8", newline="\n")
     print(
         f"updated {len(carriers)} PLMN records "
-        f"({len(names)} generic records, {len(identity_rules)} identity rules, "
-        f"version {output['meta']['aosp_version']})"
+        f"({len(names)} generic AOSP records, version {output['meta']['aosp_version']})"
     )
 
 

web/package.json

@@ -6,7 +6,6 @@
   "scripts": {
     "dev": "vite --host 127.0.0.1",
     "build": "tsc --noEmit -p tsconfig.app.json && tsc --noEmit -p tsconfig.node.json && vite build",
-    "test": "node --test test/*.test.mjs",
     "preview": "vite preview --host 127.0.0.1"
   },
   "dependencies": {