Make sure we actually allow 6 chars to be sent.

Also make note of the "A" option of date format.

Issue 9779, modifications by DEA, wedhorn, and myself.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@77996 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 64c306f274dfd1351595c5957f3b86a1bbf35cd9..2bde2e2d836a80487a7d54ec21a2969023929cbd 100644 (file)
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -2991,7 +2991,7 @@ static int handle_register_message(struct skinny_req *req, struct skinnysession
        req->data.regack.res[0] = '0';
        req->data.regack.res[1] = '\0';
        req->data.regack.keepAlive = htolel(keep_alive);
-       ast_copy_string(req->data.regack.dateTemplate, date_format, sizeof(req->data.regack.dateTemplate));
+       memcpy(req->data.regack.dateTemplate, date_format, sizeof(req->data.regack.dateTemplate));
        req->data.regack.res2[0] = '0';
        req->data.regack.res2[1] = '\0';
        req->data.regack.secondaryKeepAlive = htolel(keep_alive);
@@ -4667,7 +4667,7 @@ static int reload_config(void)
                } else if (!strcasecmp(v->name, "keepalive")) {
                        keep_alive = atoi(v->value);
                } else if (!strcasecmp(v->name, "dateformat")) {
-                       ast_copy_string(date_format, v->value, sizeof(date_format));
+                       memcpy(date_format, v->value, sizeof(date_format));
                } else if (!strcasecmp(v->name, "allow")) {
                        ast_parse_allow_disallow(&default_prefs, &default_capability, v->value, 1);
                } else if (!strcasecmp(v->name, "disallow")) {

diff --git a/configs/skinny.conf.sample b/configs/skinny.conf.sample
index 9950120831ef50c17c1c3d7a3433e10bd3388162..1ed7c4ffd364042b8e65c3c377f311159ec2f24c 100644 (file)
--- a/configs/skinny.conf.sample
+++ b/configs/skinny.conf.sample
@@ -4,7 +4,9 @@
 [general]
 bindaddr=0.0.0.0       ; Address to bind to
 bindport=2000          ; Port to bind to, default tcp/2000
-dateformat=M-D-Y       ; M,D,Y in any order (5 chars max)
+dateformat=M-D-Y       ; M,D,Y in any order (6 chars max)
+                       ; "A" may also be used, but it must be at the end.
+                       ; Use M for month, D for day, Y for year, A for 12-hour time.
 keepalive=120
 
 ;allow=all             ; see doc/rtp-packetization for framing options