From 087e1136ebc99d0d857a3b16e9e2ad3c970f64ed Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 29 Jul 2011 11:43:39 +0200 Subject: use the 'L' prefix in debug names (DLINP instead of DINP) --- src/logging.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/logging.c b/src/logging.c index 44fea98..11d63ac 100644 --- a/src/logging.c +++ b/src/logging.c @@ -73,24 +73,24 @@ static const struct log_info_cat internal_cat[OSMO_NUM_DLIB] = { .enabled = 1, }, [INT2IDX(DLINP)] = { - .name = "DINP", + .name = "DLINP", .description = "A-bis Intput Subsystem", .loglevel = LOGL_NOTICE, .enabled = 1, }, [INT2IDX(DLMUX)] = { - .name = "DMUX", + .name = "DLMUX", .description = "A-bis B-Subchannel TRAU Frame Multiplex", .loglevel = LOGL_NOTICE, .enabled = 1, }, [INT2IDX(DLMI)] = { - .name = "DMI", + .name = "DLMI", .description = "A-bis Input Driver for Signalling", .enabled = 0, .loglevel = LOGL_NOTICE, }, [INT2IDX(DLMIB)] = { - .name = "DMIB", + .name = "DLMIB", .description = "A-bis Input Driver for B-Channels (voice)", .enabled = 0, .loglevel = LOGL_NOTICE, }, -- cgit v1.2.3-55-g7522 From 2af435986f14b14171c8581fff090ea9fb41fc61 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 29 Jul 2011 15:12:41 +0200 Subject: fix off-by-one error in OSMO_NUM_DLIB This bug was introduced in 95f7eb288c4b8b69d61fa8d68957fb21f09e11e5 and it caused a segfault on 'write terminal' --- include/osmocom/core/logging.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 06d90e5..154ee19 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -43,7 +43,7 @@ void logp(int subsys, char *file, int line, int cont, const char *format, ...) _ #define DLMUX -4 #define DLMI -5 #define DLMIB -6 -#define OSMO_NUM_DLIB 7 +#define OSMO_NUM_DLIB 6 struct log_category { uint8_t loglevel; -- cgit v1.2.3-55-g7522 From 1a99df84e12315c63f2e96a2972864e4c311712d Mon Sep 17 00:00:00 2001 From: Andreas.Eversberg Date: Sat, 30 Jul 2011 20:27:40 +0200 Subject: gsm/gsm48_ie: Fix frequency list decoding Fix-by: Andreas.Eversberg Signed-off-by: Sylvain Munaut --- src/gsm/gsm48_ie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c index efcf281..863e636 100644 --- a/src/gsm/gsm48_ie.c +++ b/src/gsm/gsm48_ie.c @@ -745,7 +745,7 @@ int gsm48_decode_freq_list(struct gsm_sysinfo_freq *f, uint8_t *cd, if (w[4]) f[((w[1] - 512 + ((w[2] - 256 + w[4] - 1) % 511)) % 1023) + 1].mask |= frqt; if (w[5]) - f[((w[1] + ((w[3] - 256 - w[5] - 1) % 511)) % 1023) + 1].mask |= frqt; + f[((w[1] + ((w[3] - 256 + w[5] - 1) % 511)) % 1023) + 1].mask |= frqt; if (w[6]) f[((w[1] - 512 + ((w[2] + w[6] - 1) % 511)) % 1023) + 1].mask |= frqt; if (w[7]) -- cgit v1.2.3-55-g7522