fixed the '-e' command line option for minmemfree. updated doc/asterisk-conf.tex

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

diff --git a/doc/asterisk-conf.tex b/doc/asterisk-conf.tex
index 8464ca21dddbe4e8ab975d697405f383ccd5887f..b474b65f0c8b1e227343e1b0ef92a2a7f14f5fb9 100644 (file)
--- a/doc/asterisk-conf.tex
+++ b/doc/asterisk-conf.tex
@@ -99,6 +99,9 @@ maxload = 1.0
 ; The maximum number of concurrent calls you want to allow
 maxcalls = 255 
 
+; The minimum amount of free memory (specified in MB) that asterisk should stop accepting calls
+minmemfree = 256
+
 ; Allow #exec entries in configuration files
 execincludes = yes | no
 

diff --git a/main/asterisk.c b/main/asterisk.c
index 99604408bf104c5a5f8e0088250c37ce73a070b0..995b6df02482f21279c4af7c85f817e348991025 100644 (file)
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2607,7 +2607,7 @@ int main(int argc, char *argv[])
                switch (c) {
 #if defined(HAVE_SYSINFO)
                case 'e':
-                       if ((sscanf(optarg, "%ld", &option_minmemfree) != 1) || (option_minmemfree < 0)) {
+                       if ((sscanf(&optarg[1], "%ld", &option_minmemfree) != 1) || (option_minmemfree < 0)) {
                                option_minmemfree = 0;
                        }
                        break;