From ecb45b6d93b63d85cb2f854d8bdb7ed298d3e2b8 Mon Sep 17 00:00:00 2001
From: Keith Winstein <keithw@mit.edu>
Date: Fri, 3 Feb 2012 00:23:20 -0500
Subject: [PATCH] Rename mosh to mosh-client and make server message more
 distinctive

---
 Makefile                    | 8 ++++----
 mosh.cpp => mosh-client.cpp | 0
 mosh-server.cpp             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename mosh.cpp => mosh-client.cpp (100%)

diff --git a/Makefile b/Makefile
index d9bc829..0ee1e2a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 proto = userinput.proto hostinput.proto transportinstruction.proto
-source = parse.cpp parserstate.cpp parser.cpp terminal.cpp termemu.cpp parseraction.cpp terminalfunctions.cpp swrite.cpp terminalframebuffer.cpp terminaldispatcher.cpp terminaluserinput.cpp terminaldisplay.cpp network.cpp ntester.cpp ocb.cpp base64.cpp encrypt.cpp decrypt.cpp crypto.cpp networktransport.cpp transportfragment.cpp user.cpp userinput.pb.cc completeterminal.cpp mosh-server.cpp mosh.cpp transportinstruction.pb.cc transportsender.cpp stmclient.cpp terminaloverlay.cpp hostinput.pb.cc
+source = parse.cpp parserstate.cpp parser.cpp terminal.cpp termemu.cpp parseraction.cpp terminalfunctions.cpp swrite.cpp terminalframebuffer.cpp terminaldispatcher.cpp terminaluserinput.cpp terminaldisplay.cpp network.cpp ntester.cpp ocb.cpp base64.cpp encrypt.cpp decrypt.cpp crypto.cpp networktransport.cpp transportfragment.cpp user.cpp userinput.pb.cc completeterminal.cpp mosh-server.cpp mosh-client.cpp transportinstruction.pb.cc transportsender.cpp stmclient.cpp terminaloverlay.cpp hostinput.pb.cc
 objects = parserstate.o parser.o terminal.o parseraction.o terminalfunctions.o swrite.o terminalframebuffer.o terminaldispatcher.o terminaluserinput.o terminaldisplay.o network.o ocb.o base64.o crypto.o networktransport.o transportfragment.o user.o userinput.pb.o completeterminal.o transportinstruction.pb.o transportsender.o stmclient.o terminaloverlay.o hostinput.pb.o
-executables = parse termemu ntester encrypt decrypt mosh-server mosh
+executables = parse termemu ntester encrypt decrypt mosh-server mosh-client
 
 CXX = g++
 CXXFLAGS = -g -O2 --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=500 -D_GNU_SOURCE -D_BSD_SOURCE
@@ -28,8 +28,8 @@ decrypt: decrypt.o $(objects)
 mosh-server: mosh-server.o $(objects)
 	$(CXX) $(CXXFLAGS) -o $@ mosh-server.o $(objects) $(LIBS)
 
-mosh: mosh.o $(objects)
-	$(CXX) $(CXXFLAGS) -o $@ mosh.o $(objects) $(LIBS)
+mosh-client: mosh-client.o $(objects)
+	$(CXX) $(CXXFLAGS) -o $@ mosh-client.o $(objects) $(LIBS)
 
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
diff --git a/mosh.cpp b/mosh-client.cpp
similarity index 100%
rename from mosh.cpp
rename to mosh-client.cpp
diff --git a/mosh-server.cpp b/mosh-server.cpp
index c0146a7..ae58b4f 100644
--- a/mosh-server.cpp
+++ b/mosh-server.cpp
@@ -166,7 +166,7 @@ void serve( int host_fd, const char *desired_ip )
 
   /* network.set_verbose(); */
 
-  printf( "CONNECT %d %s\n", network.port(), network.get_key().c_str() );
+  printf( "MOSH CONNECT %d %s\n", network.port(), network.get_key().c_str() );
   fflush( stdout );
 
   /* prepare to poll for events */