Finish rename (stm to mosh)
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
proto = userinput.proto hostinput.proto transportinstruction.proto
|
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 stm-server.cpp stm.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.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
|
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 stm-server stm
|
executables = parse termemu ntester encrypt decrypt mosh-server mosh
|
||||||
|
|
||||||
CXX = g++
|
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
|
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
|
||||||
@@ -25,11 +25,11 @@ encrypt: encrypt.o $(objects)
|
|||||||
decrypt: decrypt.o $(objects)
|
decrypt: decrypt.o $(objects)
|
||||||
$(CXX) $(CXXFLAGS) -o $@ decrypt.o $(objects) $(LIBS)
|
$(CXX) $(CXXFLAGS) -o $@ decrypt.o $(objects) $(LIBS)
|
||||||
|
|
||||||
stm-server: stm-server.o $(objects)
|
mosh-server: mosh-server.o $(objects)
|
||||||
$(CXX) $(CXXFLAGS) -o $@ stm-server.o $(objects) $(LIBS)
|
$(CXX) $(CXXFLAGS) -o $@ mosh-server.o $(objects) $(LIBS)
|
||||||
|
|
||||||
stm: stm.o $(objects)
|
mosh: mosh.o $(objects)
|
||||||
$(CXX) $(CXXFLAGS) -o $@ stm.o $(objects) $(LIBS)
|
$(CXX) $(CXXFLAGS) -o $@ mosh.o $(objects) $(LIBS)
|
||||||
|
|
||||||
%.o: %.cpp
|
%.o: %.cpp
|
||||||
$(CXX) $(CXXFLAGS) -c -o $@ $<
|
$(CXX) $(CXXFLAGS) -c -o $@ $<
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ int main( int argc, char *argv[] )
|
|||||||
|
|
||||||
/* Verify locale calls for UTF-8 */
|
/* Verify locale calls for UTF-8 */
|
||||||
if ( strcmp( nl_langinfo( CODESET ), "UTF-8" ) != 0 ) {
|
if ( strcmp( nl_langinfo( CODESET ), "UTF-8" ) != 0 ) {
|
||||||
fprintf( stderr, "stm requires a UTF-8 locale.\n" );
|
fprintf( stderr, "mosh requires a UTF-8 locale.\n" );
|
||||||
exit( 1 );
|
exit( 1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -115,7 +115,7 @@ int main( int argc, char *argv[] )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
printf( "[stm-server is exiting.]\n" );
|
printf( "[mosh-server is exiting.]\n" );
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -44,7 +44,7 @@ void Transport<MyState, RemoteState>::recv( void )
|
|||||||
Instruction inst = fragments.get_assembly();
|
Instruction inst = fragments.get_assembly();
|
||||||
|
|
||||||
if ( inst.protocol_version() != MOSH_PROTOCOL_VERSION ) {
|
if ( inst.protocol_version() != MOSH_PROTOCOL_VERSION ) {
|
||||||
throw NetworkException( "Mosh protocol version mismatch", 0 );
|
throw NetworkException( "mosh protocol version mismatch", 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
sender.process_acknowledgment_through( inst.ack_num() );
|
sender.process_acknowledgment_through( inst.ack_num() );
|
||||||
|
|||||||
Reference in New Issue
Block a user