diff options
| author | Harald Welte <laforge@gnumonks.org> | 2009-09-27 11:13:55 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2009-09-27 11:13:55 +0200 |
| commit | 23b710fa4f424f6e6afd4c1e2cea38f3767d8b5d (patch) | |
| tree | cb01f51a2552c87dc1e22922c814f74a0e711e47 /openbsc/src/gsm_04_08.c | |
| parent | 82aa6843ba4773ff90571442ab75bfa8800b73c0 (diff) | |
| parent | 849f554c87174ea465c18b93104f67fb516c0c2f (diff) | |
Merge branch 'master' into encryption
Diffstat (limited to 'openbsc/src/gsm_04_08.c')
| -rw-r--r-- | openbsc/src/gsm_04_08.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/openbsc/src/gsm_04_08.c b/openbsc/src/gsm_04_08.c index 6eb49c2b5..d6fe09fa2 100644 --- a/openbsc/src/gsm_04_08.c +++ b/openbsc/src/gsm_04_08.c @@ -1233,7 +1233,7 @@ int gsm48_tx_mm_auth_req(struct gsm_lchan *lchan, u_int8_t *rand) { struct msgb *msg = gsm48_msgb_alloc(); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); - u_int8_t *r; + struct gsm48_auth_req *ar = (struct gsm48_auth_req *) msgb_put(msg, sizeof(*ar)); DEBUGP(DMM, "-> AUTH REQ\n"); @@ -1241,10 +1241,12 @@ int gsm48_tx_mm_auth_req(struct gsm_lchan *lchan, u_int8_t *rand) gh->proto_discr = GSM48_PDISC_MM; gh->msg_type = GSM48_MT_MM_AUTH_REQ; + /* Key Sequence: FIXME fixed to 0 */ + ar->key_seq = 0; + /* 16 bytes RAND parameters */ - r = msgb_put(msg, 16); if (rand) - memcpy(r, rand, 16); + memcpy(ar->rand, rand, 16); return gsm48_sendmsg(msg, NULL); } @@ -3608,11 +3610,12 @@ int gsm0408_rcvmsg(struct msgb *msg, u_int8_t link_id) break; case GSM48_PDISC_MM_GPRS: case GSM48_PDISC_SM_GPRS: - fprintf(stderr, "Unimplemented GSM 04.08 discriminator 0x%02d\n", + case GSM48_PDISC_NC_SS: /* mobile-originated USSD */ + fprintf(stderr, "Unimplemented GSM 04.08 discriminator 0x%02x\n", pdisc); break; default: - fprintf(stderr, "Unknown GSM 04.08 discriminator 0x%02d\n", + fprintf(stderr, "Unknown GSM 04.08 discriminator 0x%02x\n", pdisc); break; } |