On Wed, Dec 18, 2013 at 05:17:16PM +0100, Andreas Eversberg wrote:
i just wanted to show in the vty config that fr is
supported, even
if it is mandatory and cannot be made unsupported.
What about this? It makes it mandatory to define fr first. The other
things I noticed is:
* Currently the default codec MNCC-intern uses is EFR. After the change
it will be FR.
* The BTS should be involved as well to ack/nack the codec support
(we can do that later)
* The BSC part should start to honor this support too.
diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c
index 1bc0ea1..9801b6a 100644
--- a/openbsc/src/libbsc/bsc_vty.c
+++ b/openbsc/src/libbsc/bsc_vty.c
@@ -2663,13 +2663,13 @@ static void _get_codec_from_arg(struct vty *vty, int argc, const
char *argv[])
}
}
-#define CODEC_PAR_STR " (fr|hr|efr|amr)"
-#define CODEC_HELP_STR "Full Rate (mandatory)\nHalf Rate\n" \
+#define CODEC_PAR_STR " (hr|efr|amr)"
+#define CODEC_HELP_STR "Half Rate\n" \
"Enhanced Full Rate\nAdaptive Multirate\n"
DEFUN(cfg_bts_codec1, cfg_bts_codec1_cmd,
- "codec-support" CODEC_PAR_STR,
- "Codec Support settings\n"
+ "codec-support fr" CODEC_PAR_STR,
+ "Codec Support settings\nFullrate\n"
CODEC_HELP_STR)
{
_get_codec_from_arg(vty, 1, argv);
@@ -2677,8 +2677,8 @@ DEFUN(cfg_bts_codec1, cfg_bts_codec1_cmd,
}
DEFUN(cfg_bts_codec2, cfg_bts_codec2_cmd,
- "codec-support" CODEC_PAR_STR CODEC_PAR_STR,
- "Codec Support settings\n"
+ "codec-support fr" CODEC_PAR_STR CODEC_PAR_STR,
+ "Codec Support settings\nFullrate\n"
CODEC_HELP_STR CODEC_HELP_STR)
{
_get_codec_from_arg(vty, 2, argv);
@@ -2686,8 +2686,8 @@ DEFUN(cfg_bts_codec2, cfg_bts_codec2_cmd,
}
DEFUN(cfg_bts_codec3, cfg_bts_codec3_cmd,
- "codec-support" CODEC_PAR_STR CODEC_PAR_STR CODEC_PAR_STR,
- "Codec Support settings\n"
+ "codec-support fr" CODEC_PAR_STR CODEC_PAR_STR CODEC_PAR_STR,
+ "Codec Support settings\nFullrate\n"
CODEC_HELP_STR CODEC_HELP_STR CODEC_HELP_STR)
{
_get_codec_from_arg(vty, 3, argv);
@@ -2695,8 +2695,8 @@ DEFUN(cfg_bts_codec3, cfg_bts_codec3_cmd,
}
DEFUN(cfg_bts_codec4, cfg_bts_codec4_cmd,
- "codec-support" CODEC_PAR_STR CODEC_PAR_STR CODEC_PAR_STR CODEC_PAR_STR,
- "Codec Support settings\n"
+ "codec-support fr" CODEC_PAR_STR CODEC_PAR_STR CODEC_PAR_STR CODEC_PAR_STR,
+ "Codec Support settings\nFullrate\n"
CODEC_HELP_STR CODEC_HELP_STR CODEC_HELP_STR CODEC_HELP_STR)
{
_get_codec_from_arg(vty, 4, argv);