From 3293dfb5001b48a5d33c2f0172d0cefc04f0bf45 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Wed, 15 Sep 2021 12:29:15 +0200 Subject: [PATCH] C-Netz: Fix calls to 8-digits subscriber numbers --- src/cnetz/cnetz.c | 2 +- src/cnetz/database.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cnetz/cnetz.c b/src/cnetz/cnetz.c index 6df05f0..4239b1c 100644 --- a/src/cnetz/cnetz.c +++ b/src/cnetz/cnetz.c @@ -646,7 +646,7 @@ inval: PDEBUG_CHAN(DCNETZ, DEBUG_INFO, "Call to mobile station, paging station id '%s'\n", dialing); /* 6. trying to page mobile station */ - trans = create_transaction(cnetz, (spk) ? TRANS_VAK : TRANS_WSK, dialing[0] - '0', dialing[1] - '0', atoi(dialing + 2), -1, -1); + trans = create_transaction(cnetz, (spk) ? TRANS_VAK : TRANS_WSK, futln_nat, futln_fuvst, futln_rest, -1, -1); if (!trans) { PDEBUG(DCNETZ, DEBUG_ERROR, "Failed to create transaction\n"); return -CAUSE_TEMPFAIL; diff --git a/src/cnetz/database.c b/src/cnetz/database.c index 3a7a30b..44c1f59 100644 --- a/src/cnetz/database.c +++ b/src/cnetz/database.c @@ -63,7 +63,7 @@ static void remove_db(cnetz_db_t *db) } *dbp = db->next; - PDEBUG(DDB, DEBUG_INFO, "Removing subscriber '%d,%d,%d' from database.\n", db->futln_nat, db->futln_fuvst, db->futln_rest); + PDEBUG(DDB, DEBUG_INFO, "Removing subscriber '%d,%d,%05d' from database.\n", db->futln_nat, db->futln_fuvst, db->futln_rest); timer_exit(&db->timer); @@ -76,7 +76,7 @@ static void db_timeout(struct timer *timer) cnetz_db_t *db = (cnetz_db_t *)timer->priv; int rc; - PDEBUG(DDB, DEBUG_INFO, "Check, if subscriber '%d,%d,%d' is still available.\n", db->futln_nat, db->futln_fuvst, db->futln_rest); + PDEBUG(DDB, DEBUG_INFO, "Check, if subscriber '%d,%d,%05d' is still available.\n", db->futln_nat, db->futln_fuvst, db->futln_rest); rc = cnetz_meldeaufruf(db->futln_nat, db->futln_fuvst, db->futln_rest); if (rc < 0) { @@ -121,7 +121,7 @@ int update_db(cnetz_t __attribute__((unused)) *cnetz, uint8_t futln_nat, uint8_t dbp = &((*dbp)->next); *dbp = db; - PDEBUG(DDB, DEBUG_INFO, "Adding subscriber '%d,%d,%d' to database.\n", db->futln_nat, db->futln_fuvst, db->futln_rest); + PDEBUG(DDB, DEBUG_INFO, "Adding subscriber '%d,%d,%05d' to database.\n", db->futln_nat, db->futln_fuvst, db->futln_rest); } if (futelg_bit && *futelg_bit >= 0) @@ -131,15 +131,15 @@ int update_db(cnetz_t __attribute__((unused)) *cnetz, uint8_t futln_nat, uint8_t db->extended = *extended; if (busy) { - PDEBUG(DDB, DEBUG_INFO, "Subscriber '%d,%d,%d' busy now.\n", db->futln_nat, db->futln_fuvst, db->futln_rest); + PDEBUG(DDB, DEBUG_INFO, "Subscriber '%d,%d,%05d' busy now.\n", db->futln_nat, db->futln_fuvst, db->futln_rest); timer_stop(&db->timer); } else if (!failed) { - PDEBUG(DDB, DEBUG_INFO, "Subscriber '%d,%d,%d' idle now.\n", db->futln_nat, db->futln_fuvst, db->futln_rest); + PDEBUG(DDB, DEBUG_INFO, "Subscriber '%d,%d,%05d' idle now.\n", db->futln_nat, db->futln_fuvst, db->futln_rest); timer_start(&db->timer, MELDE_INTERVAL); /* when to check avaiability (again) */ db->retry = 0; } else { db->retry++; - PDEBUG(DDB, DEBUG_NOTICE, "Paging subscriber '%d,%d,%d' failed (try %d of %d).\n", db->futln_nat, db->futln_fuvst, db->futln_rest, db->retry, MELDE_MAXIMAL); + PDEBUG(DDB, DEBUG_NOTICE, "Paging subscriber '%d,%d,%05d' failed (try %d of %d).\n", db->futln_nat, db->futln_fuvst, db->futln_rest, db->retry, MELDE_MAXIMAL); if (db->retry == MELDE_MAXIMAL) { remove_db(db); return db->extended; @@ -190,7 +190,7 @@ void dump_db(void) } while (db) { - PDEBUG(DDB, DEBUG_NOTICE, " - Subscriber '%d,%d,%d' is attached.\n", db->futln_nat, db->futln_fuvst, db->futln_rest); + PDEBUG(DDB, DEBUG_NOTICE, " - Subscriber '%d,%d,%05d' is attached.\n", db->futln_nat, db->futln_fuvst, db->futln_rest); db = db->next; } }