F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: (fixes #744) Fix escape characters in introspected command line

Browse Source
This commit is contained in:
Tommaso Pecorella
2022-09-16 22:51:39 +02:00
parent 1e64e58f92
commit c35d3f5d0e
3 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/model/command-line.cc
View File

@@ -71,24 +71,8 @@ Encode (const std::string & source)
case '&': buffer.append ("&"); break;
case '\"': buffer.append ("""); break;
case '\'': buffer.append ("'"); break;
// case '>': buffer.append (">"); break;
case '<': {
// Special case:
// "...blah <file..." is not allowed
// "...foo<bar..." is allowed
if (buffer.back () == ' ')
{
buffer.append ("&lt;");
}
else
{
buffer.append ("<");
}
break;
}
case '>': buffer.append ("&gt;"); break;
case '<': buffer.append ("&lt;"); break;
default: buffer.append (&source[pos], 1); break;
}
/* *NS_CHECK_STYLE_ON* */

6
src/traffic-control/examples/adaptive-red-tests.cc
View File

@@ -215,9 +215,9 @@ main (int argc, char *argv[])
CommandLine cmd (__FILE__);
cmd.AddValue ("testNumber", "Run test 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14 or 15", aredTest);
cmd.AddValue ("pathOut", "Path to save results from --writeForPlot/--writePcap/--writeFlowMonitor", pathOut);
cmd.AddValue ("writeForPlot", "<0/1> to write results for plot (gnuplot)", writeForPlot);
cmd.AddValue ("writePcap", "<0/1> to write results in pcapfile", writePcap);
cmd.AddValue ("writeFlowMonitor", "<0/1> to enable Flow Monitor and write their results", flowMonitor);
cmd.AddValue ("writeForPlot", "Write results for plot (gnuplot)", writeForPlot);
cmd.AddValue ("writePcap", "Write results in pcapfile", writePcap);
cmd.AddValue ("writeFlowMonitor", "Enable Flow Monitor and write their results", flowMonitor);
cmd.Parse (argc, argv);
if ((aredTest < 1) || (aredTest == 5) || (aredTest > 15))

6
src/traffic-control/examples/red-tests.cc
View File

@@ -292,9 +292,9 @@ main (int argc, char *argv[])
CommandLine cmd (__FILE__);
cmd.AddValue ("testNumber", "Run test 1, 3, 4 or 5", redTest);
cmd.AddValue ("pathOut", "Path to save results from --writeForPlot/--writePcap/--writeFlowMonitor", pathOut);
cmd.AddValue ("writeForPlot", "<0/1> to write results for plot (gnuplot)", writeForPlot);
cmd.AddValue ("writePcap", "<0/1> to write results in pcapfile", writePcap);
cmd.AddValue ("writeFlowMonitor", "<0/1> to enable Flow Monitor and write their results", flowMonitor);
cmd.AddValue ("writeForPlot", "Write results for plot (gnuplot)", writeForPlot);
cmd.AddValue ("writePcap", "Write results in pcapfile", writePcap);
cmd.AddValue ("writeFlowMonitor", "Enable Flow Monitor and write their results", flowMonitor);
cmd.Parse (argc, argv);
if ( (redTest != 1) && (redTest != 3) && (redTest != 4) && (redTest != 5) )