Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
210 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
From: YunQiang Su <wzssyqa@gmail.com> | ||
Date: Fri, 15 Jun 2012 03:01:12 +0800 | ||
Subject: install-indep-utils.diff | ||
|
||
--- | ||
Makefile.in | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/Makefile.in b/Makefile.in | ||
index 2e6ff5f..f53d78a 100644 | ||
--- a/Makefile.in | ||
+++ b/Makefile.in | ||
@@ -549,7 +549,7 @@ dirs: | ||
done | ||
|
||
|
||
-install: dirs force install-ns install-man | ||
+install: dirs force install-ns install-man install-recursive | ||
|
||
install-ns: force | ||
$(INSTALL) -m 755 ns $(DESTDIR)$(BINDEST) | ||
-- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
From: YunQiang Su <wzssyqa@gmail.com> | ||
Date: Fri, 15 Jun 2012 03:01:12 +0800 | ||
Subject: fix-gcc-4.7-ftbfs.patch | ||
|
||
--- | ||
linkstate/ls.h | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/linkstate/ls.h b/linkstate/ls.h | ||
index 5a7800a..ba91c3d 100644 | ||
--- a/linkstate/ls.h | ||
+++ b/linkstate/ls.h | ||
@@ -134,7 +134,7 @@ public: | ||
return ib.second ? ib.first : baseMap::end(); | ||
} | ||
|
||
- void eraseAll() { erase(baseMap::begin(), baseMap::end()); } | ||
+ void eraseAll() { baseMap::erase(baseMap::begin(), baseMap::end()); } | ||
T* findPtr(Key key) { | ||
iterator it = baseMap::find(key); | ||
return (it == baseMap::end()) ? (T *)NULL : &((*it).second); | ||
-- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
From: Aron Xu <aron@debian.org> | ||
Date: Fri, 15 Jun 2012 03:11:02 +0800 | ||
Subject: correct paths in examples | ||
|
||
--- | ||
tcl/ex/asym/asym-test-2.tcl | 2 +- | ||
tcl/ex/tcp-fs/drop.awk | 2 +- | ||
tcl/ex/tcp-fs/inst-thruput.awk | 2 +- | ||
tcl/ex/tcp-fs/process.awk | 2 +- | ||
tcl/ex/tcp-fs/resptime.awk | 2 +- | ||
tcl/ex/tcp-fs/run-fs-asym.tcl | 2 +- | ||
tcl/ex/tcp-fs/run.tcl | 2 +- | ||
tcl/ex/tcp-fs/thruput.awk | 2 +- | ||
tcl/session/scaling-tree.tcl | 2 +- | ||
9 files changed, 9 insertions(+), 9 deletions(-) | ||
|
||
diff --git a/tcl/ex/asym/asym-test-2.tcl b/tcl/ex/asym/asym-test-2.tcl | ||
index 9db1928..912b42b 100755 | ||
--- a/tcl/ex/asym/asym-test-2.tcl | ||
+++ b/tcl/ex/asym/asym-test-2.tcl | ||
@@ -1,4 +1,4 @@ | ||
-#!../../../../ns | ||
+#!/usr/bin/ns | ||
#source ../../../lan/ns-lan.tcl | ||
source ../../../ex/asym/util.tcl | ||
|
||
diff --git a/tcl/ex/tcp-fs/drop.awk b/tcl/ex/tcp-fs/drop.awk | ||
index 6dbbc11..3625993 100755 | ||
--- a/tcl/ex/tcp-fs/drop.awk | ||
+++ b/tcl/ex/tcp-fs/drop.awk | ||
@@ -1,4 +1,4 @@ | ||
-#!/usr/local/bin/gawk -f | ||
+#!/usr/bin/gawk -f | ||
BEGIN { | ||
fsDrops = 0; | ||
otherDrops = 0; | ||
diff --git a/tcl/ex/tcp-fs/inst-thruput.awk b/tcl/ex/tcp-fs/inst-thruput.awk | ||
index b26f626..ae081ae 100755 | ||
--- a/tcl/ex/tcp-fs/inst-thruput.awk | ||
+++ b/tcl/ex/tcp-fs/inst-thruput.awk | ||
@@ -1,4 +1,4 @@ | ||
-#!/usr/local/bin/gawk -f | ||
+#!/usr/bin/gawk -f | ||
{ | ||
time = $2; | ||
saddr = $4; | ||
diff --git a/tcl/ex/tcp-fs/process.awk b/tcl/ex/tcp-fs/process.awk | ||
index 48ce788..825bd4f 100755 | ||
--- a/tcl/ex/tcp-fs/process.awk | ||
+++ b/tcl/ex/tcp-fs/process.awk | ||
@@ -1,4 +1,4 @@ | ||
-#!/usr/local/bin/gawk -f | ||
+#!/usr/bin/gawk -f | ||
BEGIN { | ||
erriter = -1; | ||
} | ||
diff --git a/tcl/ex/tcp-fs/resptime.awk b/tcl/ex/tcp-fs/resptime.awk | ||
index 39b74b9..cc4178b 100755 | ||
--- a/tcl/ex/tcp-fs/resptime.awk | ||
+++ b/tcl/ex/tcp-fs/resptime.awk | ||
@@ -1,4 +1,4 @@ | ||
-#!/usr/local/bin/gawk -f | ||
+#!/usr/bin/gawk -f | ||
{ | ||
if (NR > 1) | ||
sum += ($3 - $2); | ||
diff --git a/tcl/ex/tcp-fs/run-fs-asym.tcl b/tcl/ex/tcp-fs/run-fs-asym.tcl | ||
index aefe248..d9530c0 100755 | ||
--- a/tcl/ex/tcp-fs/run-fs-asym.tcl | ||
+++ b/tcl/ex/tcp-fs/run-fs-asym.tcl | ||
@@ -1,4 +1,4 @@ | ||
-#! /usr/sww/bin/tclsh | ||
+#! /usr/bin/tclsh | ||
|
||
set burstsize 30 | ||
set firstburstsize 0 | ||
diff --git a/tcl/ex/tcp-fs/run.tcl b/tcl/ex/tcp-fs/run.tcl | ||
index d0a7e1c..791447c 100755 | ||
--- a/tcl/ex/tcp-fs/run.tcl | ||
+++ b/tcl/ex/tcp-fs/run.tcl | ||
@@ -1,4 +1,4 @@ | ||
-#! /usr/local/bin/tclsh | ||
+#! /usr/bin/tclsh | ||
|
||
#set pdrop_opt {-null -null "-recn -rdrop" "-pdrop" "-recn -rdrop -pdrop"} | ||
#set tcptype_opt {-fack -fackfs -fackfs -fackfs -fackfs} | ||
diff --git a/tcl/ex/tcp-fs/thruput.awk b/tcl/ex/tcp-fs/thruput.awk | ||
index 79c8e4e..e8e7911 100755 | ||
--- a/tcl/ex/tcp-fs/thruput.awk | ||
+++ b/tcl/ex/tcp-fs/thruput.awk | ||
@@ -1,4 +1,4 @@ | ||
-#!/usr/local/bin/gawk -f | ||
+#!/usr/bin/gawk -f | ||
BEGIN { | ||
s = ""; | ||
} | ||
diff --git a/tcl/session/scaling-tree.tcl b/tcl/session/scaling-tree.tcl | ||
index c8c4931..310ded1 100755 | ||
--- a/tcl/session/scaling-tree.tcl | ||
+++ b/tcl/session/scaling-tree.tcl | ||
@@ -1,4 +1,4 @@ | ||
-#! ../../ns | ||
+#!/usr/bin/ns | ||
source scaling-defaults.tcl | ||
|
||
# Usage tree.tcl -rand 1.0 -det 0.05 -seed -size $max >! tmp.dat | ||
-- |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
install-indep-utils.diff | ||
tclcl-header-move.patch | ||
fix-gcc-4.7-ftbfs.patch | ||
0001-install-indep-utils.diff.patch | ||
0002-tclcl-header-move.patch.patch | ||
0003-fix-gcc-4.7-ftbfs.patch.patch | ||
0004-correct-paths-in-examples.patch |