diff options
| author | Harald Welte <laforge@gnumonks.org> | 2013-10-13 18:22:44 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2013-10-13 18:22:44 +0200 |
| commit | 2aa67b809f5b06fb86a6f8dfc556bfb7c9169729 (patch) | |
| tree | 81aabb15f5635ebc4cf07806bd98345a20fd5675 /src/gsmd/usock.c | |
| parent | 58a9b679e9084f4a7061dc3d00a6a3177e2559fa (diff) | |
wavecom/sysmocom: use AT@COPS if available, instead of AT+COPS
In certain sysmocom proprietary versions of the wavecom modem,
we have a non-blocking operator scan command called AT@COPS=?,
which we can use instead of AT+COPS=?.
The wavecom vendor plugin checks at start time if the command is
available. If yes, iti s used in case a libgsm client is asking for an
operator scan, instead of the standard AT+COPS=? variant.
Diffstat (limited to 'src/gsmd/usock.c')
| -rw-r--r-- | src/gsmd/usock.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/gsmd/usock.c b/src/gsmd/usock.c index 41814c8..157a874 100644 --- a/src/gsmd/usock.c +++ b/src/gsmd/usock.c @@ -1062,7 +1062,14 @@ static int network_opers_parse(const char *str, struct gsmd_msg_oper **out) return len; } -static int network_opers_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp) +/* should we use AT@COPS=? instead of AT+COPS=? */ +int g_use_ATatCOPS; + +/* the last user that requested an AT@COPS=? scan */ +struct gsmd_user *g_last_cops_user; +int g_last_cops_id; + +int network_opers_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp) { struct gsmd_user *gu = ctx; struct gsmd_msg_oper *buf = NULL; @@ -1206,7 +1213,12 @@ static int usock_rcv_network(struct gsmd_user *gu, struct gsmd_msg_hdr *gph, cmd = atcmd_fill("AT+COPS?", 8+1, &network_oper_n_cb, gu, 0, NULL); break; case GSMD_NETWORK_OPER_LIST: - cmd = atcmd_fill("AT+COPS=?", 9+1, &network_opers_cb, gu, 0, NULL); + if (g_use_ATatCOPS) { + g_last_cops_user = gu; + g_last_cops_id = cmd->id; + cmd = atcmd_fill("AT@COPS=?", 9+1, &network_opers_cb, gu, 0, NULL); + } else + cmd = atcmd_fill("AT+COPS=?", 9+1, &network_opers_cb, gu, 0, NULL); break; case GSMD_NETWORK_PREF_LIST: /* Set long alphanumeric format */ |