From a4503de845ec6c6edf820bbf1875cc33e962896e Mon Sep 17 00:00:00 2001
From: Michael Schwartz <mykesx@gmail.com>
Date: Sat, 14 Jan 2012 12:39:47 -0800
Subject: [PATCH] Rest of files for SSH2 implementation.

---
 Makefile       |  4 ++++
 src/Makefile   |  9 ++++++---
 src/global.cpp |  2 ++
 src/net.cpp    | 12 ------------
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 2d799e5..b55a951 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,10 @@ bootstrap:
 	cd src && make -f$(MAKEFILE) bootstrap
 	cp src/bootstrap-silkjs .
 
+debug:
+	cd src && make -f$(MAKEFILE) debug
+	cp src/silkjs .
+
 clean:
 	cd src && make -f$(MAKEFILE) clean
 
diff --git a/src/Makefile b/src/Makefile
index ad27f69..9a5b54c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,7 +2,7 @@ ARCH := $(shell getconf LONG_BIT)
 
 CORE=	main.o base64.o global.o console.o process.o net.o fs.o buffer.o v8.o http.o md5.o 
 
-OBJ=	mysql.o gd.o ncurses.o sem.o logfile.o sqlite3.o curl.o
+OBJ=	mysql.o gd.o ncurses.o sem.o logfile.o sqlite3.o curl.o ssh2.o
 
 V8DIR=	./v8-read-only
 
@@ -19,11 +19,14 @@ V8=	$(V8LIB_DIR)/libv8_base.a $(V8LIB_DIR)/libv8_snapshot.a
 CFLAGS = -O6 -fomit-frame-pointer -fdata-sections -ffunction-sections -fno-strict-aliasing -fno-rtti -fno-exceptions -fvisibility=hidden -Wall -W -Wno-unused-parameter -Wnon-virtual-dtor -m$(ARCH) -O3 -fomit-frame-pointer -fdata-sections -ffunction-sections -ansi -fno-strict-aliasing
 
 %.o: %.cpp SilkJS.h Makefile
-	g++ $(CFLAGS) -c -I$(V8DIR)/include -I/usr/include/mysql -g -o $*.o $*.cpp
+	g++ $(CFLAGS) -c -I$(V8DIR)/include -I/usr/include/mysql -o $*.o $*.cpp
 
 silkjs:	$(V8) $(CORE) $(OBJ) SilkJS.h Makefile
-	g++ $(CFLAGS) -o silkjs $(CORE) $(OBJ) -L$(V8LIB_DIR)/ -lv8_base -lv8_snapshot -L/usr/local/lib/mysql -lmysqlclient -lmm -lgd -lncurses -lssl -lpthread -lsqlite3 -lcurl
+	g++ $(CFLAGS) -o silkjs $(CORE) $(OBJ) -L$(V8LIB_DIR)/ -lv8_base -lv8_snapshot -L/usr/local/lib/mysql -lmysqlclient -lmm -lgd -lncurses -lssl -lpthread -lsqlite3 -lcurl -lssh2
 
+debug:	    CFLAGS += -g
+debug:	    silkjs
+	
 bootstrap:  CFLAGS += -DBOOTSTRAP_SILKJS
 
 bootstrap:  $(V8) $(CORE) SilkJS.h Makefile
diff --git a/src/global.cpp b/src/global.cpp
index cbafd97..32c51f1 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -77,6 +77,7 @@ extern void init_gd_object();
 extern void init_ncurses_object();
 extern void init_logfile_object();
 extern void init_xhrHelper_object();
+extern void init_ssh_object();
 #endif
 
 void init_global_object() {
@@ -99,6 +100,7 @@ void init_global_object() {
 	init_gd_object();
 	init_ncurses_object();
 	init_xhrHelper_object();
+	init_ssh_object();
 #endif
 	globalObject->Set(String::New("log"), FunctionTemplate::New(Log));
 	globalObject->Set(String::New("print"), FunctionTemplate::New(Print));
diff --git a/src/net.cpp b/src/net.cpp
index 0fb08fc..08b44d3 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -286,17 +286,6 @@ static JSVAL net_sendfile(JSARGS args) {
     return Undefined();
 }
 
-//static JSVAL net_flush(JSARGS args) {
-//    HandleScope scope;
-//	int fd = args[0]->IntegerValue();
-//#ifdef USE_CORK	
-//    int flag = 0;
-//    setsockopt( fd, IPPROTO_TCP, TCP_CORK, (char *)&flag, sizeof(flag) );
-//    flag = 1;
-//    setsockopt( fd, IPPROTO_TCP, TCP_CORK, (char *)&flag, sizeof(flag) );
-//#endif
-//	return Undefined();
-//}
 
 void init_net_object() {
 	HandleScope scope;
@@ -312,7 +301,6 @@ void init_net_object() {
 	net->Set(String::New("write"), FunctionTemplate::New(net_write));
 	net->Set(String::New("writeBuffer"), FunctionTemplate::New(net_writebuffer));
 	net->Set(String::New("sendFile"), FunctionTemplate::New(net_sendfile));
-//	net->Set(String::New("flush"), FunctionTemplate::New(net_flush));
 
 	globalObject->Set(String::New("net"), net);
 }