#This patch was developed both in-house and from outside. We plan to submit it
#upstream, but do not yet have a target date for doing so
#
# HG changeset patch
# Parent d152462d834972011a3adb91cfcda352fe36b076
22213636 Solaris OFED ibutils-1.5.7-0.2.gbd7e502.0.1 needs fix for CVE-2013-2561
ibutils: Fix for CVE-2013-2561 (use /var/cache/ibutils not /tmp)
Apps should use /var/cache/ibutils instead of /tmp
CVE: 2013-2561
Signed-off-by: Mukesh Kacker <mukesh.kacker@oracle.com>
---
diff -r d152462d8349 ibdiag/demo/sm-single-master.tcl
--- a/ibdiag/demo/sm-single-master.tcl Fri Nov 13 06:48:21 2015 -0800
+++ b/ibdiag/demo/sm-single-master.tcl Sat Nov 14 23:02:51 2015 -0800
@@ -132,7 +132,7 @@
gets stdin
puts " h. Make one of teh SMs sweep: kill -HUP %2."
puts " Now one of the SMs gets to standby mode"
- puts " i. Run ibdiagnet again to see the info about the SMs in /tmp/ibdiagnet.sm"
+ puts " i. Run ibdiagnet again to see the info about the SMs in /var/cache/ibutils/ibdiagnet.sm"
puts " "
puts " press Enter when done"
gets stdin
diff -r d152462d8349 ibdiag/doc/ibdiag_release_notes.txt
--- a/ibdiag/doc/ibdiag_release_notes.txt Fri Nov 13 06:48:21 2015 -0800
+++ b/ibdiag/doc/ibdiag_release_notes.txt Sat Nov 14 23:02:51 2015 -0800
@@ -61,7 +61,7 @@
+ Load subnet database from file:
Ibdiagnet dumps its internal database, which contains the subnet structure,
- to a file (/tmp/ibdiagnet.db by default). This file can be loaded in later
+ to a file (/var/cache/ibutils/ibdiagnet.db by default). This file can be loaded in later
ibdiagnet runs (using the -load_db <db file> option). When this option is set,
ibdiagnet loads the subnet data from the file and skips the discovery stage.
Using this option can save the subnet discovery time for large cluster.
@@ -221,11 +221,11 @@
===============================================================================
3. Reports
===============================================================================
-The default directory for all generated report files is /tmp .
+The default directory for all generated report files is /var/cache/ibutils .
Both utilities collect summary information regarding all the fabric SM's
during the run, and then output that information at end of the run in file
-/tmp/ibdiagnet.sm.
+/var/cache/ibutils/ibdiagnet.sm.
Each report message includes:
- Device Type
diff -r d152462d8349 ibdiag/doc/ibdiagnet.pod
--- a/ibdiag/doc/ibdiagnet.pod Fri Nov 13 06:48:21 2015 -0800
+++ b/ibdiag/doc/ibdiagnet.pod Sat Nov 14 23:02:51 2015 -0800
@@ -244,7 +244,7 @@
=over
Write out the discovered topology into the given file. This flag is useful if you later want to check for changes from the current state of the fabric.
-A directory named ibdiag_ibnl is also created by this option, and holds the IBNL files required to load this topology. To use these files you will need to set the environment variable named IBDM_IBNL_PATH to that directory. The directory is located in /tmp or in the output directory provided by the -o flag.
+A directory named ibdiag_ibnl is also created by this option, and holds the IBNL files required to load this topology. To use these files you will need to set the environment variable named IBDM_IBNL_PATH to that directory. The directory is located in /var/cache/ibutils or in the output directory provided by the -o flag.
=back
diff -r d152462d8349 ibdiag/doc/ibdiagnet.txt
--- a/ibdiag/doc/ibdiagnet.txt Fri Nov 13 06:48:21 2015 -0800
+++ b/ibdiag/doc/ibdiagnet.txt Sat Nov 14 23:02:51 2015 -0800
@@ -49,7 +49,7 @@
-p <port-num> : Specifies the local device's port number used to connect to
the IB fabric
-o <out-dir> : Specifies the directory where the output files will be placed
- (default = /tmp/ez)
+ (default = /var/cache/ibutils)
-h|--help : Prints this help information
-V|--version : Prints the version of the tool
diff -r d152462d8349 ibdiag/doc/ibdiagpath.pod
--- a/ibdiag/doc/ibdiagpath.pod Fri Nov 13 06:48:21 2015 -0800
+++ b/ibdiag/doc/ibdiagpath.pod Sat Nov 14 23:02:51 2015 -0800
@@ -135,7 +135,8 @@
=over
=item
-Specifies the directory where the output files will be placed (default = /tmp)
+Specifies the directory where the output files will be placed (default =
+/var/cache/ibutils)
=back
diff -r d152462d8349 ibdiag/src/ibdebug_if.tcl
--- a/ibdiag/src/ibdebug_if.tcl Fri Nov 13 06:48:21 2015 -0800
+++ b/ibdiag/src/ibdebug_if.tcl Sat Nov 14 23:02:51 2015 -0800
@@ -170,7 +170,7 @@
-n,error "-E-argv:bad.node.name"
-o,name "out.dir"
- -o,default "/tmp"
+ -o,default "/var/cache/ibutils"
-o,param "out-dir"
-o,desc "Specifies the directory where the output files will be placed"
diff -r d152462d8349 ibdiag/src/ibdiagui.tcl
--- a/ibdiag/src/ibdiagui.tcl Fri Nov 13 06:48:21 2015 -0800
+++ b/ibdiag/src/ibdiagui.tcl Sat Nov 14 23:02:51 2015 -0800
@@ -2141,7 +2141,7 @@
close $f
set lstFile [file join $testModeDir ibdiagnet.lst]
} else {
- set lstFile /tmp/ibdiagnet.lst
+ set lstFile /var/cache/ibutils/ibdiagnet.lst
set r ""
LogAppend "-I-Invoking ibdiagnet ...."
# puts "-I- Invoking ibdiagnet ...."
diff -r d152462d8349 ibdm/README
--- a/ibdm/README Fri Nov 13 06:48:21 2015 -0800
+++ b/ibdm/README Sat Nov 14 23:02:51 2015 -0800
@@ -39,7 +39,7 @@
Description:
After the cluster is built and OpenSM is run (using flag -D 0x43) it reports the
- subnet and FDB tables into the files /tmp/subnet.lst and /tmp/osm.fdbs.
+ subnet and FDB tables into the files /var/cache/ibutils/subnet.lst and /var/cache/ibutils/osm.fdbs.
Based on these files the utility checks all CA to CA connectivity. Further analysis
for credit deadlock potential is performed and reported.
In case of an LMC > 0 it reports histograms for how many systems and nodes
@@ -50,11 +50,11 @@
Options:
-v|--verbose = verbsoe mode
-h|--help = provide this help message
- -s|--subnet <file> = OpenSM subnet.lst file (default is /tmp/subnet.lst)
+ -s|--subnet <file> = OpenSM subnet.lst file (default is /var/cache/ibutils/subnet.lst)
-f|--fdb <file> = OpenSM dump of Ucast LFDB. Use -D 0x41 to generate it.
- (default is /tmp/osm.fdbs).
+ (default is /var/cache/ibutils/osm.fdbs).
-m|--mcfdb <file> = OpenSM dump of Multicast LFDB. Use -D 0x41 to generate it.
- (default is /tmp/osm.mcfdbs).
+ (default is /var/cache/ibutils/osm.mcfdbs).
-r|--roots <roots file> = a file holding all root nodes guids (one per line).
diff -r d152462d8349 ibdm/doc/ibdmchk.1
--- a/ibdm/doc/ibdmchk.1 Fri Nov 13 06:48:21 2015 -0800
+++ b/ibdm/doc/ibdmchk.1 Sat Nov 14 23:02:51 2015 -0800
@@ -186,7 +186,7 @@
.IX Item "-r|--roots <roots file> A file with all the roots node names (one on each line)."
.SH "VERIFICATION MODE DESCRIPTION"
.IX Header "VERIFICATION MODE DESCRIPTION"
-After the cluster is built and OpenSM is run (using flag \-D 0x43) it reports the subnet and \s-1FDB\s0 tables into the files osm\-subnet.lst, osm.fdbs and osm.fdbs in /var/log/ (or subnet.lst, osm.fdbs and osm.mcfdbs into /tmp in older OpenSM versions). ibdiagnet is also producing the same files in its output directory.
+After the cluster is built and OpenSM is run (using flag \-D 0x43) it reports the subnet and \s-1FDB\s0 tables into the files osm\-subnet.lst, osm.fdbs and osm.fdbs in /var/log/ (or subnet.lst, osm.fdbs and osm.mcfdbs into /var/cache/ibutils in older OpenSM versions). ibdiagnet is also producing the same files in its output directory.
Based on these files the utility checks all \s-1CA\s0 to \s-1CA\s0 connectivity. Further analysis for credit deadlock potential is performed and reported.
In case of an \s-1LMC\s0 > 0 it reports histograms for how many systems and nodes are common between the different paths for the same port pairs.
.SH "ARGUMENTS"
@@ -208,15 +208,15 @@
.RE
.IP "\-s|\-\-subnet <file>"
.IX Item "-s|--subnet <file>"
-OpenSM subnet.lst file (default is /var/log/osm\-subnet.lst or /tmp/subnet.lst)
+OpenSM subnet.lst file (default is /var/log/osm\-subnet.lst or /var/cache/ibutils/subnet.lst)
.RE
.IP "\-f|\-\-fdb <file>"
.IX Item "-f|--fdb <file>"
-OpenSM dump of Ucast \s-1LFDB\s0. Use \-D 0x41 to generate it (default is /var/log/osm.fdbs or /tmp/osm.fdbs).
+OpenSM dump of Ucast \s-1LFDB\s0. Use \-D 0x41 to generate it (default is /var/log/osm.fdbs or /var/cache/ibutils/osm.fdbs).
.RE
.IP "\-m|\-\-mcfdb <file>"
.IX Item "-m|--mcfdb <file>"
-OpenSM dump of Multicast \s-1LFDB\s0. Use \-D 0x41 to generate it (default is /var/log/osm.mcfdbs or /tmp/osm.mcfdbs).
+OpenSM dump of Multicast \s-1LFDB\s0. Use \-D 0x41 to generate it (default is /var/log/osm.mcfdbs or /var/cache/ibutils/osm.mcfdbs).
.RE
.IP "\-c|\-\-psl <file>"
.IX Item "-c|--psl <file>"
diff -r d152462d8349 ibdm/doc/ibdmchk.pod
--- a/ibdm/doc/ibdmchk.pod Fri Nov 13 06:48:21 2015 -0800
+++ b/ibdm/doc/ibdmchk.pod Sat Nov 14 23:02:51 2015 -0800
@@ -59,7 +59,7 @@
=head1 VERIFICATION MODE DESCRIPTION
-After the cluster is built and OpenSM is run (using flag -D 0x43) it reports the subnet and FDB tables into the files osm-subnet.lst, osm.fdbs and osm.fdbs in /var/log/ (or subnet.lst, osm.fdbs and osm.mcfdbs into /tmp in older OpenSM versions). ibdiagnet is also producing the same files in its output directory.
+After the cluster is built and OpenSM is run (using flag -D 0x43) it reports the subnet and FDB tables into the files osm-subnet.lst, osm.fdbs and osm.fdbs in /var/log/ (or subnet.lst, osm.fdbs and osm.mcfdbs into /var/cache/ibutils in older OpenSM versions). ibdiagnet is also producing the same files in its output directory.
Based on these files the utility checks all CA to CA connectivity. Further analysis for credit deadlock potential is performed and reported.
In case of an LMC > 0 it reports histograms for how many systems and nodes are common between the different paths for the same port pairs.
@@ -81,15 +81,15 @@
=item -s|--subnet <file>
-OpenSM subnet.lst file (default is /var/log/osm-subnet.lst or /tmp/subnet.lst)
+OpenSM subnet.lst file (default is /var/log/osm-subnet.lst or /var/cache/ibutils/subnet.lst)
=item -f|--fdb <file>
-OpenSM dump of Ucast LFDB. Use -D 0x41 to generate it (default is /var/log/osm.fdbs or /tmp/osm.fdbs).
+OpenSM dump of Ucast LFDB. Use -D 0x41 to generate it (default is /var/log/osm.fdbs or /var/cache/ibutils/osm.fdbs).
=item -m|--mcfdb <file>
-OpenSM dump of Multicast LFDB. Use -D 0x41 to generate it (default is /var/log/osm.mcfdbs or /tmp/osm.mcfdbs).
+OpenSM dump of Multicast LFDB. Use -D 0x41 to generate it (default is /var/log/osm.mcfdbs or /var/cache/ibutils/osm.mcfdbs).
=item -c|--psl <file>
diff -r d152462d8349 ibdm/ibdm/LinkCover.cpp
--- a/ibdm/ibdm/LinkCover.cpp Fri Nov 13 06:48:21 2015 -0800
+++ b/ibdm/ibdm/LinkCover.cpp Sat Nov 14 23:02:51 2015 -0800
@@ -302,7 +302,7 @@
set< string > vars;
int numLinks = 0;
IBNode *p_node;
- ofstream linProgram("/tmp/ibdmchk.lp");
+ ofstream linProgram("/var/cache/ibutils/ibdmchk.lp");
// we need a doubel path - first collect all in ports and
// dump out the target - maximize number of links covered
@@ -890,8 +890,8 @@
// iteration only.
map_pnode_p_sint outPortUsedMap;
cout << "-I- Generating non blocking full link coverage plan into:"
- << "/tmp/ibdmchk.non_block_all_links" << endl;
- ofstream linkProgram("/tmp/ibdmchk.non_block_all_links");
+ << "/var/cache/ibutils/ibdmchk.non_block_all_links" << endl;
+ ofstream linkProgram("/var/cache/ibutils/ibdmchk.non_block_all_links");
// initialize the data structures
if (initFdbForwardPortLidTables(
diff -r d152462d8349 ibdm/ibdm/SubnMgt.cpp
--- a/ibdm/ibdm/SubnMgt.cpp Fri Nov 13 06:48:21 2015 -0800
+++ b/ibdm/ibdm/SubnMgt.cpp Sat Nov 14 23:02:51 2015 -0800
@@ -1104,7 +1104,7 @@
#if DO_CA_TO_CA_NUM_PATHS_HIST
// report the link over subscription histogram and dump out the
// num paths per switch out port
- ofstream linkUsage("/tmp/ibdmchk.sw_out_port_num_paths");
+ ofstream linkUsage("/var/cache/ibutils/ibdmchk.sw_out_port_num_paths");
linkUsage << "# NUM-PATHS PORT-NAME " << endl;
vec_int linkSubscriptionHist(maxLinkSubscriptions + 1,0);
for (map_pnode_vec_int::iterator nI = switchPathsPerOutPort.begin();
@@ -1127,7 +1127,7 @@
cout << "all the CA to CA paths. Ports driving CAs are ignored (as they must" << endl;
cout << "have = Nca - 1). If the fabric is routed correctly the histogram" << endl;
cout << "should be narrow for all ports on same level of the tree." << endl;
- cout << "A detailed report is provided in /tmp/ibdmchk.sw_out_port_num_paths.\n" << endl;
+ cout << "A detailed report is provided in /var/cache/ibutils/ibdmchk.sw_out_port_num_paths.\n" << endl;
cout << "NUM-PATHS NUM-SWITCH-PORTS" << endl;
for (int b = 0; b <= maxLinkSubscriptions; b++)
if (linkSubscriptionHist[b])
@@ -1136,7 +1136,7 @@
#endif
// now do the DLID per out port:
- ofstream portDlidsUsage("/tmp/ibdmchk.sw_out_port_num_dlids");
+ ofstream portDlidsUsage("/var/cache/ibutils/ibdmchk.sw_out_port_num_dlids");
portDlidsUsage << "# NUM-DLIDS PORT-NAME " << endl;
vec_int dlidsSubscriptionHist(maxDlidPerOutPort + 1,0);
for (map_pnode_vec_int::iterator nI = switchDLidsPerOutPort.begin();
@@ -1159,7 +1159,7 @@
cout << "all the CA to CA paths. Ports driving CAs are ignored (as they must" << endl;
cout << "have = Nca - 1). If the fabric is routed correctly the histogram" << endl;
cout << "should be narrow for all ports on same level of the tree." << endl;
- cout << "A detailed report is provided in /tmp/ibdmchk.sw_out_port_num_dlids.\n" << endl;
+ cout << "A detailed report is provided in /var/cache/ibutils/ibdmchk.sw_out_port_num_dlids.\n" << endl;
cout << "NUM-DLIDS NUM-SWITCH-PORTS" << endl;
for (int b = 0; b <= maxDlidPerOutPort; b++)
if (dlidsSubscriptionHist[b])
diff -r d152462d8349 ibdm/src/lst2ibnl
--- a/ibdm/src/lst2ibnl Fri Nov 13 06:48:21 2015 -0800
+++ b/ibdm/src/lst2ibnl Sat Nov 14 23:02:51 2015 -0800
@@ -70,8 +70,8 @@
ARGUMENTS (required)
-l <lst file>
Input fabric link listing file as generated by OpenSM
- (/tmp/subnet.lst or /var/log/osm.lst depending on the version) or
- ibdiagnet (/tmp/ibdiagnet.lst)
+ (/var/cache/ibutils/subnet.lst or /var/log/osm.lst depending on the version) or
+ ibdiagnet (/var/cache/ibutils/ibdiagnet.lst)
-p <port-name>
The name of the switch system front panel port connected to the
@@ -96,8 +96,8 @@
0. Make sure the file Gnu.lst does not exist
1. Connect an HCA in machine we call "host" to FPP L1/P1
- 2. Run ibdiagnet on the "host" machine (will create /tmp/ibdiagnet.lst)
- 3. Run lst2ibnl -l /tmp/ibdiagnet.lst -s Gnu -p L1/P1
+ 2. Run ibdiagnet on the "host" machine (will create /var/cache/ibutils/ibdiagnet.lst)
+ 3. Run lst2ibnl -l /var/cache/ibutils/ibdiagnet.lst -s Gnu -p L1/P1
4. Perform steps 1..3 by connecting the "host" to each one of the
front panel ports and providing its name on the subsequent call to
lst2ibnl
diff -r d152462d8349 ibdm/src/osm_check.cpp
--- a/ibdm/src/osm_check.cpp Fri Nov 13 06:48:21 2015 -0800
+++ b/ibdm/src/osm_check.cpp Sat Nov 14 23:02:51 2015 -0800
@@ -86,7 +86,7 @@
<< " Description:\n"
<< " After the cluster is built and OpenSM is run (using flag -D 0x43) it reports the\n"
<< " subnet and FDB tables into the files osm-subnet.lst, osm.fdbs and osm.fdbs in\n"
- << " /var/log/ (or subnet.lst, osm.fdbs and osm.mcfdbs into /tmp in older versions).\n"
+ << " /var/log/ (or subnet.lst, osm.fdbs and osm.mcfdbs into /var/cache/ibutils in older versions).\n"
<< " If more than one SL is known to be used additional file holding CAxCA->SL mapping \n"
<< " is generated (format: 0xsrc_guid dlid sl) . In this case the SL2VL mapping is \n"
<< " optionally supplied in an additional file (format: 0xsw_guid inport outport 0x(sl0)(sl1),\n"
@@ -102,11 +102,11 @@
<< " Options:\n"
<< " -v|--verbose = verbose mode\n"
<< " -h|--help = provide this help message\n"
- << " -s|--subnet <file> = OpenSM subnet.lst file (/var/log/osm-subnet.lst or /tmp/subnet.lst)\n"
+ << " -s|--subnet <file> = OpenSM subnet.lst file (/var/log/osm-subnet.lst or /var/cache/ibutils/subnet.lst)\n"
<< " -f|--fdb <file> = OpenSM dump of Ucast LFDB. Use -D 0x41 to generate it.\n"
- << " (default is /var/log/osm.fdbs or /tmp/osm.fdbs).\n"
+ << " (default is /var/log/osm.fdbs or /var/cache/ibutils/osm.fdbs).\n"
<< " -m|--mcfdb <file> = OpenSM dump of Multicast LFDB. Use -D 0x41 to generate it.\n"
- << " (default is /var/log/osm.mcfdbs or /tmp/osm.mcfdbs).\n"
+ << " (default is /var/log/osm.mcfdbs or /var/cache/ibutils/osm.mcfdbs).\n"
<< " -c|--psl <file> = CAxCA->SL mapping. Each line holds: srcguid dlid sl \n"
<< " -d|--slvl <file> = SL2VL mapping. Each line holds: swguid iport oport 0x(sl0)(sl1) 0x(sl2)(sl3)...\n"
<< " -r|--roots <roots file> = a file holding all root nodes guids (one per line).\n"
@@ -465,20 +465,20 @@
if (fdbFile.size() == 0) {
if (access("/var/log/osm.fdbs",R_OK) == 0)
fdbFile = string("/var/log/osm.fdbs");
- else if (access("/tmp/osm.fdbs",R_OK) == 0)
- fdbFile = string("/tmp/osm.fdbs");
+ else if (access("/var/cache/ibutils/osm.fdbs",R_OK) == 0)
+ fdbFile = string("/var/cache/ibutils/osm.fdbs");
else {
- cout << "-E- Could not find a readble osm.fdbs in /var/log or /tmp" << endl;
+ cout << "-E- Could not find a readble osm.fdbs in /var/log or /var/cache/ibutils" << endl;
anyMissingFile = 1;
}
}
if (mcFdbFile.size() == 0) {
if (access("/var/log/osm.mcfdbs",R_OK) == 0)
mcFdbFile = string("/var/log/osm.mcfdbs");
- else if (access("/tmp/osm.mcfdbs",R_OK) == 0)
- mcFdbFile = string("/tmp/osm.mcfdbs");
+ else if (access("/var/cache/ibutils/osm.mcfdbs",R_OK) == 0)
+ mcFdbFile = string("/var/cache/ibutils/osm.mcfdbs");
else {
- cout << "-E- Could not find a readble osm.mcfdbs in /var/log or /tmp" << endl;
+ cout << "-E- Could not find a readble osm.mcfdbs in /var/log or /var/cache/ibutils" << endl;
anyMissingFile = 1;
}
}
@@ -486,10 +486,10 @@
if (subnetFile.size() == 0) {
if (access("/var/log/osm-subnet.lst",R_OK) == 0)
subnetFile = string("/var/log/osm-subnet.lst");
- else if (access("/tmp/subnet.lst",R_OK) == 0)
- subnetFile = string("/tmp/subnet.lst");
+ else if (access("/var/cache/ibutils/subnet.lst",R_OK) == 0)
+ subnetFile = string("/var/cache/ibutils/subnet.lst");
else {
- cout << "-E- Could not find a readble /var/log/osm-subnet.lst or /tmp/subnet.lst" << endl;
+ cout << "-E- Could not find a readble /var/log/osm-subnet.lst or /var/cache/ibutils/subnet.lst" << endl;
anyMissingFile = 1;
}
}
@@ -587,7 +587,7 @@
// rank the fabric by these roots
map_pnode_int nodesRank;
SubnRankFabricNodesByRootNodes(&fabric, rootNodes, nodesRank);
- ofstream rankFile("/tmp/ibdmchk.node_ranking");
+ ofstream rankFile("/var/cache/ibutils/ibdmchk.node_ranking");
rankFile << "-I- Node Ranking:" << endl;
for(map_pnode_int::iterator nI = nodesRank.begin();
nI != nodesRank.end(); nI++)
diff -r d152462d8349 ibis/src/ibis.i
--- a/ibis/src/ibis.i Fri Nov 13 06:48:21 2015 -0800
+++ b/ibis/src/ibis.i Sat Nov 14 23:02:51 2015 -0800
@@ -564,7 +564,7 @@
IbisOpts.m_key = 0;
IbisOpts.v_key = 0;
IbisOpts.log_flags = OSM_LOG_ERROR;
- strcpy(IbisOpts.log_file,"/tmp/ibis.log");
+ strcpy(IbisOpts.log_file,"/var/cache/ibutils/ibis.log");
/* we want all exists to cleanup */
diff -r d152462d8349 ibis/src/ibis_wrap.c
--- a/ibis/src/ibis_wrap.c Fri Nov 13 06:48:21 2015 -0800
+++ b/ibis/src/ibis_wrap.c Sat Nov 14 23:02:51 2015 -0800
@@ -75130,7 +75130,7 @@
IbisOpts.m_key = 0;
IbisOpts.v_key = 0;
IbisOpts.log_flags = OSM_LOG_ERROR;
- strcpy(IbisOpts.log_file,"/tmp/ibis.log");
+ strcpy(IbisOpts.log_file,"/var/cache/ibutils/ibis.log");
/* we want all exists to cleanup */
diff -r d152462d8349 ibis/src/ibissh_wrap.cpp
--- a/ibis/src/ibissh_wrap.cpp Fri Nov 13 06:48:21 2015 -0800
+++ b/ibis/src/ibissh_wrap.cpp Sat Nov 14 23:02:51 2015 -0800
@@ -75203,7 +75203,7 @@
IbisOpts.m_key = 0;
IbisOpts.v_key = 0;
IbisOpts.log_flags = OSM_LOG_ERROR;
- strcpy(IbisOpts.log_file,"/tmp/ibis.log");
+ strcpy(IbisOpts.log_file,"/var/cache/ibutils/ibis.log");
/* we want all exists to cleanup */
diff -r d152462d8349 ibis/tests/ibcr_test.tcl
--- a/ibis/tests/ibcr_test.tcl Fri Nov 13 06:48:21 2015 -0800
+++ b/ibis/tests/ibcr_test.tcl Sat Nov 14 23:02:51 2015 -0800
@@ -132,7 +132,7 @@
#
package require ibis
ibis_set_verbosity 0xff
-ibis_opts configure -log_file /tmp/ibcr_test.log
+ibis_opts configure -log_file /var/cache/ibutils/ibcr_test.log
ibis_init
set availPorts [ibis_get_local_ports_info]
diff -r d152462d8349 ibmgtsim/doc/IBMgtSim.1
--- a/ibmgtsim/doc/IBMgtSim.1 Fri Nov 13 06:48:21 2015 -0800
+++ b/ibmgtsim/doc/IBMgtSim.1 Sat Nov 14 23:02:51 2015 -0800
@@ -158,7 +158,7 @@
.RE
.IP "\-l log-file"
.IX Item "-l log-file"
-Set the log file of the simulator (default is /tmp/ibsim.log)
+Set the log file of the simulator (default is /var/cache/ibutils/ibsim.log)
.RE
.IP "\-p server-port"
.IX Item "-p server-port"
diff -r d152462d8349 ibmgtsim/doc/IBMgtSim.pod
--- a/ibmgtsim/doc/IBMgtSim.pod Fri Nov 13 06:48:21 2015 -0800
+++ b/ibmgtsim/doc/IBMgtSim.pod Sat Nov 14 23:02:51 2015 -0800
@@ -30,7 +30,7 @@
=item -l log-file
-Set the log file of the simulator (default is /tmp/ibsim.log)
+Set the log file of the simulator (default is /var/cache/ibutils/ibsim.log)
=item -p server-port
diff -r d152462d8349 ibmgtsim/src/client.cpp
--- a/ibmgtsim/src/client.cpp Fri Nov 13 06:48:21 2015 -0800
+++ b/ibmgtsim/src/client.cpp Sat Nov 14 23:02:51 2015 -0800
@@ -158,7 +158,7 @@
if (getenv("IBMGTSIM_DIR"))
simDir = getenv("IBMGTSIM_DIR");
else
- simDir = "/tmp/ibmgtsim";
+ simDir = "/var/cache/ibutils/ibmgtsim";
std::string serverFileName = simDir + "/ibmgtsim.server";
diff -r d152462d8349 ibmgtsim/src/sim.cpp
--- a/ibmgtsim/src/sim.cpp Fri Nov 13 06:48:21 2015 -0800
+++ b/ibmgtsim/src/sim.cpp Sat Nov 14 23:02:51 2015 -0800
@@ -50,8 +50,8 @@
if (!getenv("IBMGTSIM_DIR")) {
printf("-W- Environment variable: IBMGTSIM_DIR does not exist.\n");
printf(" Please create one used by the simulator.\n");
- printf(" Using /tmp/ibmgtsim as default.\n");
- return "/tmp/ibmgtsim";
+ printf(" Using /var/cache/ibutils/ibmgtsim as default.\n");
+ return "/var/cache/ibutils/ibmgtsim";
}
return getenv("IBMGTSIM_DIR");
}
diff -r d152462d8349 ibmgtsim/tests/FatTree.check.tcl
--- a/ibmgtsim/tests/FatTree.check.tcl Fri Nov 13 06:48:21 2015 -0800
+++ b/ibmgtsim/tests/FatTree.check.tcl Sat Nov 14 23:02:51 2015 -0800
@@ -44,7 +44,7 @@
puts "-I- Starting: $osmPath -R ftree -d2 -V -g $osmPortGuid ..."
#set osmPid [exec $osmPath -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
set osmPid [exec $osmPath -R ftree -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
- #set osmPid [exec valgrind --tool=memcheck -v --log-file-exactly=/tmp/kliteyn/osm.valgrind.log $osmPath -R ftree -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
+ #set osmPid [exec valgrind --tool=memcheck -v --log-file-exactly=/var/cache/ibutils/osm.valgrind.log $osmPath -R ftree -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
# start a tracker on the log file and process:
startOsmLogAnalyzer $osmLog
diff -r d152462d8349 ibmgtsim/tests/FatTreeFails.check.tcl
--- a/ibmgtsim/tests/FatTreeFails.check.tcl Fri Nov 13 06:48:21 2015 -0800
+++ b/ibmgtsim/tests/FatTreeFails.check.tcl Sat Nov 14 23:02:51 2015 -0800
@@ -44,7 +44,7 @@
puts "-I- Starting: $osmPath -R ftree -d2 -V -g $osmPortGuid ..."
#set osmPid [exec $osmPath -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
set osmPid [exec $osmPath -R ftree -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
- #set osmPid [exec valgrind --tool=memcheck -v --log-file-exactly=/tmp/kliteyn/osm.valgrind.log $osmPath -R ftree -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
+ #set osmPid [exec valgrind --tool=memcheck -v --log-file-exactly=/var/cache/ibutils/osm.valgrind.log $osmPath -R ftree -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
# start a tracker on the log file and process:
startOsmLogAnalyzer $osmLog
diff -r d152462d8349 ibmgtsim/tests/init.test.tcl
--- a/ibmgtsim/tests/init.test.tcl Fri Nov 13 06:48:21 2015 -0800
+++ b/ibmgtsim/tests/init.test.tcl Sat Nov 14 23:02:51 2015 -0800
@@ -30,7 +30,7 @@
# SOFTWARE.
#--
-MsgMgr setLogFile "/tmp/sim.log"
+MsgMgr setLogFile "/var/cache/ibutils/sim.log"
MsgMgr setVerbLevel $MsgShowAll
IBMgtSimulator init /home/eitan/SW/cvsroot/IBADM/ibdm/Clusters/RhinoBased512.topo 46517 5
puts [IBMgtSimulator getFabric]
@@ -42,7 +42,7 @@
set mcm [madMcMemberRec]
madMcMemberRec_send_set $mcm simnode:1:SL2-2/spine1/U2 1 1 0
-MsgMgr setLogFile "/tmp/sim.log"
+MsgMgr setLogFile "/var/cache/ibutils/sim.log"
MsgMgr setVerbLevel $MsgShowAll
IBMgtSimulator init /home/eitan/SW/cvsroot/IBADM/ibdm/Clusters/FullGnu.topo 46517 5
source /home/eitan/SW/SVN/osm/branches/main2_0/osm/test/osmMulticastRoutingTest.sim.tcl
@@ -60,7 +60,7 @@
}
}
-MsgMgr setLogFile "/tmp/sim.log"
+MsgMgr setLogFile "/var/cache/ibutils/sim.log"
MsgMgr setVerbLevel $MsgShowAll
IBMgtSimulator init /usr/share/ibmgtsim/Gnu16NodeOsmTest.topo 46517 1
set f [IBMgtSimulator getFabric]
@@ -72,7 +72,7 @@
activateNodePorts [lindex $nodeNameNPtr 1]
}
-MsgMgr setLogFile "/tmp/sim.log"
+MsgMgr setLogFile "/var/cache/ibutils/sim.log"
MsgMgr setVerbLevel $MsgShowAll
IBMgtSimulator init test.topo 46517 1
set f [IBMgtSimulator getFabric]
diff -r d152462d8349 ibmgtsim/utils/IBMgtSim
--- a/ibmgtsim/utils/IBMgtSim Fri Nov 13 06:48:21 2015 -0800
+++ b/ibmgtsim/utils/IBMgtSim Sat Nov 14 23:02:51 2015 -0800
@@ -73,7 +73,7 @@
Command Line Options:
-s seed = the seed to be used for random number generation.
-f flow-tcl-file = a tcl file to be sourced after the fabric is setup.
- -l log-file = set the log file of the simulator (default is /tmp/ibsim.log)
+ -l log-file = set the log file of the simulator (default is /var/cache/ibutils/ibsim.log)
-p server-port = set the port number the server attaches to (default 46517)
-w num-threads = the number of threads processing the mads
-V <module-verbosity-pair-list> = Provides a fine grain control over
@@ -375,7 +375,7 @@
#
set moduleVerbosityList {top 0xA7}
-set logFileName /tmp/ibsim.log
+set logFileName /var/cache/ibutils/ibsim.log
set numWorkerThreads 1
set serverPortNum 46517
set simulationFlowFile ""
diff -r d152462d8349 ibmgtsim/utils/RunSimTest
--- a/ibmgtsim/utils/RunSimTest Fri Nov 13 06:48:21 2015 -0800
+++ b/ibmgtsim/utils/RunSimTest Sat Nov 14 23:02:51 2015 -0800
@@ -775,7 +775,7 @@
set osmTrackerPipes {}
# define tmp directory to use:
-set tmpDir /tmp
+set tmpDir /var/cache/ibutils
# Define the temporary directory:
set simDir [file join $tmpDir ibmgtsim.$pid]