diff options
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/Makefile.am | 6 | ||||
-rw-r--r-- | src/ae.h (renamed from src/ae.hpp) | 0 | ||||
-rw-r--r-- | src/base64.cc (renamed from src/base64.cpp) | 0 | ||||
-rw-r--r-- | src/completeterminal.cc (renamed from src/completeterminal.cpp) | 2 | ||||
-rw-r--r-- | src/completeterminal.h (renamed from src/completeterminal.hpp) | 4 | ||||
-rw-r--r-- | src/crypto.cc (renamed from src/crypto.cpp) | 4 | ||||
-rw-r--r-- | src/crypto.h (renamed from src/crypto.hpp) | 4 | ||||
-rw-r--r-- | src/dos_assert.h (renamed from src/dos_assert.hpp) | 2 | ||||
-rw-r--r-- | src/mosh-client.cc (renamed from src/mosh-client.cpp) | 4 | ||||
-rw-r--r-- | src/mosh-server.cc (renamed from src/mosh-server.cpp) | 8 | ||||
-rw-r--r-- | src/network.cc (renamed from src/network.cpp) | 6 | ||||
-rw-r--r-- | src/network.h (renamed from src/network.hpp) | 2 | ||||
-rw-r--r-- | src/networktransport.cc (renamed from src/networktransport.cpp) | 4 | ||||
-rw-r--r-- | src/networktransport.h (renamed from src/networktransport.hpp) | 6 | ||||
-rw-r--r-- | src/ocb.cc (renamed from src/ocb.cpp) | 2 | ||||
-rw-r--r-- | src/parser.cc (renamed from src/parser.cpp) | 2 | ||||
-rw-r--r-- | src/parser.h (renamed from src/parser.hpp) | 8 | ||||
-rw-r--r-- | src/parseraction.cc (renamed from src/parseraction.cpp) | 4 | ||||
-rw-r--r-- | src/parseraction.h (renamed from src/parseraction.hpp) | 0 | ||||
-rw-r--r-- | src/parserstate.cc (renamed from src/parserstate.cpp) | 4 | ||||
-rw-r--r-- | src/parserstate.h (renamed from src/parserstate.hpp) | 2 | ||||
-rw-r--r-- | src/parserstatefamily.h (renamed from src/parserstatefamily.hpp) | 2 | ||||
-rw-r--r-- | src/parsertransition.h (renamed from src/parsertransition.hpp) | 2 | ||||
-rw-r--r-- | src/stmclient.cc (renamed from src/stmclient.cpp) | 10 | ||||
-rw-r--r-- | src/stmclient.h (renamed from src/stmclient.hpp) | 8 | ||||
-rw-r--r-- | src/swrite.cc (renamed from src/swrite.cpp) | 2 | ||||
-rw-r--r-- | src/swrite.h (renamed from src/swrite.hpp) | 0 | ||||
-rw-r--r-- | src/terminal.cc (renamed from src/terminal.cpp) | 4 | ||||
-rw-r--r-- | src/terminal.h (renamed from src/terminal.hpp) | 10 | ||||
-rw-r--r-- | src/terminaldispatcher.cc (renamed from src/terminaldispatcher.cpp) | 6 | ||||
-rw-r--r-- | src/terminaldispatcher.h (renamed from src/terminaldispatcher.hpp) | 0 | ||||
-rw-r--r-- | src/terminaldisplay.cc (renamed from src/terminaldisplay.cpp) | 2 | ||||
-rw-r--r-- | src/terminaldisplay.h (renamed from src/terminaldisplay.hpp) | 2 | ||||
-rw-r--r-- | src/terminalframebuffer.cc (renamed from src/terminalframebuffer.cpp) | 2 | ||||
-rw-r--r-- | src/terminalframebuffer.h (renamed from src/terminalframebuffer.hpp) | 0 | ||||
-rw-r--r-- | src/terminalfunctions.cc (renamed from src/terminalfunctions.cpp) | 6 | ||||
-rw-r--r-- | src/terminaloverlay.cc (renamed from src/terminaloverlay.cpp) | 2 | ||||
-rw-r--r-- | src/terminaloverlay.h (renamed from src/terminaloverlay.hpp) | 6 | ||||
-rw-r--r-- | src/terminaluserinput.cc (renamed from src/terminaluserinput.cpp) | 2 | ||||
-rw-r--r-- | src/terminaluserinput.h (renamed from src/terminaluserinput.hpp) | 2 | ||||
-rw-r--r-- | src/transportfragment.cc (renamed from src/transportfragment.cpp) | 2 | ||||
-rw-r--r-- | src/transportfragment.h (renamed from src/transportfragment.hpp) | 0 | ||||
-rw-r--r-- | src/transportsender.cc (renamed from src/transportsender.cpp) | 4 | ||||
-rw-r--r-- | src/transportsender.h (renamed from src/transportsender.hpp) | 6 | ||||
-rw-r--r-- | src/transportstate.h (renamed from src/transportstate.hpp) | 0 | ||||
-rw-r--r-- | src/user.cc (renamed from src/user.cpp) | 2 | ||||
-rw-r--r-- | src/user.h (renamed from src/user.hpp) | 2 |
48 files changed, 80 insertions, 80 deletions
diff --git a/configure.ac b/configure.ac index 850ee51..b97d029 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ([2.68]) AC_INIT(mosh, 0.9, mosh-devel@mit.edu) AM_INIT_AUTOMAKE(mosh, 0.9) -AC_CONFIG_SRCDIR([src/transportfragment.hpp]) +AC_CONFIG_SRCDIR([src/transportfragment.h]) AC_CONFIG_HEADERS([config.h]) AC_OUTPUT(Makefile src/Makefile protobufs/Makefile scripts/Makefile) diff --git a/src/Makefile.am b/src/Makefile.am index 08d3046..bafcc22 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,8 +5,8 @@ LDADD = -lutil -lcrypto -lrt -lm $(top_builddir)/protobufs/libmoshprotos.a bin_PROGRAMS = mosh-client mosh-server -source = parser.cpp parserstate.cpp terminal.cpp parseraction.cpp terminalfunctions.cpp swrite.cpp terminalframebuffer.cpp terminaldispatcher.cpp terminaluserinput.cpp terminaldisplay.cpp network.cpp ocb.cpp base64.cpp crypto.cpp networktransport.cpp transportfragment.cpp user.cpp completeterminal.cpp transportsender.cpp stmclient.cpp terminaloverlay.cpp +source = parser.cc parserstate.cc terminal.cc parseraction.cc terminalfunctions.cc swrite.cc terminalframebuffer.cc terminaldispatcher.cc terminaluserinput.cc terminaldisplay.cc network.cc ocb.cc base64.cc crypto.cc networktransport.cc transportfragment.cc user.cc completeterminal.cc transportsender.cc stmclient.cc terminaloverlay.cc -mosh_client_SOURCES = mosh-client.cpp $(source) +mosh_client_SOURCES = mosh-client.cc $(source) -mosh_server_SOURCES = mosh-server.cpp $(source) +mosh_server_SOURCES = mosh-server.cc $(source) diff --git a/src/base64.cpp b/src/base64.cc index 028e2f4..028e2f4 100644 --- a/src/base64.cpp +++ b/src/base64.cc diff --git a/src/completeterminal.cpp b/src/completeterminal.cc index 3897414..f9e974f 100644 --- a/src/completeterminal.cpp +++ b/src/completeterminal.cc @@ -1,4 +1,4 @@ -#include "completeterminal.hpp" +#include "completeterminal.h" #include "hostinput.pb.h" diff --git a/src/completeterminal.hpp b/src/completeterminal.h index 44f5330..217364c 100644 --- a/src/completeterminal.hpp +++ b/src/completeterminal.h @@ -1,8 +1,8 @@ #ifndef COMPLETE_TERMINAL_HPP #define COMPLETE_TERMINAL_HPP -#include "parser.hpp" -#include "terminal.hpp" +#include "parser.h" +#include "terminal.h" /* This class represents the complete terminal -- a UTF8Parser feeding Actions to an Emulator. */ diff --git a/src/crypto.cpp b/src/crypto.cc index 1681f21..fd0d5a7 100644 --- a/src/crypto.cpp +++ b/src/crypto.cc @@ -1,7 +1,7 @@ #include <string.h> #include <stdio.h> -#include "crypto.hpp" +#include "crypto.h" #include "base64.h" using namespace std; @@ -180,7 +180,7 @@ string Session::encrypt( Message plaintext ) free( pt ); free( ciphertext ); - return plaintext.nonce.cpp_str() + text; + return plaintext.nonce.cc_str() + text; } Message Session::decrypt( string ciphertext ) diff --git a/src/crypto.hpp b/src/crypto.h index 18067df..2ee5fff 100644 --- a/src/crypto.hpp +++ b/src/crypto.h @@ -1,7 +1,7 @@ #ifndef CRYPTO_HPP #define CRYPTO_HPP -#include "ae.hpp" +#include "ae.h" #include <string> #include <string.h> @@ -35,7 +35,7 @@ namespace Crypto { Nonce( uint64_t val ); Nonce( char *s_bytes, size_t len ); - string cpp_str( void ) { return string( (char *)( bytes + 4 ), 8 ); } + string cc_str( void ) { return string( (char *)( bytes + 4 ), 8 ); } char *data( void ) { return bytes; } uint64_t val( void ); }; diff --git a/src/dos_assert.hpp b/src/dos_assert.h index 1afae24..4e202d5 100644 --- a/src/dos_assert.hpp +++ b/src/dos_assert.h @@ -4,7 +4,7 @@ #include <stdio.h> #include <stdlib.h> -#include "crypto.hpp" +#include "crypto.h" static void dos_detected( const char *expression, const char *file, int line, const char *function ) { diff --git a/src/mosh-client.cpp b/src/mosh-client.cc index 878fe2b..b8312cb 100644 --- a/src/mosh-client.cpp +++ b/src/mosh-client.cc @@ -1,8 +1,8 @@ #include <stdlib.h> #include <string.h> -#include "stmclient.hpp" -#include "crypto.hpp" +#include "stmclient.h" +#include "crypto.h" int main( int argc, char *argv[] ) { diff --git a/src/mosh-server.cpp b/src/mosh-server.cc index 58efc10..8ecaffb 100644 --- a/src/mosh-server.cpp +++ b/src/mosh-server.cc @@ -14,11 +14,11 @@ #include <signal.h> #include <sys/signalfd.h> -#include "completeterminal.hpp" -#include "swrite.hpp" -#include "user.hpp" +#include "completeterminal.h" +#include "swrite.h" +#include "user.h" -#include "networktransport.cpp" +#include "networktransport.cc" void serve( int host_fd, const char *desired_ip ); diff --git a/src/network.cpp b/src/network.cc index d7b23e6..4b9afcc 100644 --- a/src/network.cpp +++ b/src/network.cc @@ -5,9 +5,9 @@ #include <assert.h> #include <endian.h> -#include "dos_assert.hpp" -#include "network.hpp" -#include "crypto.hpp" +#include "dos_assert.h" +#include "network.h" +#include "crypto.h" using namespace std; using namespace Network; diff --git a/src/network.hpp b/src/network.h index 4a8204e..a10b38c 100644 --- a/src/network.hpp +++ b/src/network.h @@ -8,7 +8,7 @@ #include <string> #include <math.h> -#include "crypto.hpp" +#include "crypto.h" using namespace std; using namespace Crypto; diff --git a/src/networktransport.cpp b/src/networktransport.cc index e551dc2..cc6a588 100644 --- a/src/networktransport.cpp +++ b/src/networktransport.cc @@ -1,9 +1,9 @@ #include <assert.h> #include <iostream> -#include "networktransport.hpp" +#include "networktransport.h" -#include "transportsender.cpp" +#include "transportsender.cc" using namespace Network; using namespace std; diff --git a/src/networktransport.hpp b/src/networktransport.h index 5433a9b..0a9d11b 100644 --- a/src/networktransport.hpp +++ b/src/networktransport.h @@ -7,9 +7,9 @@ #include <list> #include <vector> -#include "network.hpp" -#include "transportsender.hpp" -#include "transportfragment.hpp" +#include "network.h" +#include "transportsender.h" +#include "transportfragment.h" using namespace std; @@ -70,7 +70,7 @@ /* Includes and compiler specific definitions */ /* ----------------------------------------------------------------------- */ -#include "ae.hpp" +#include "ae.h" #include <stdlib.h> #include <string.h> diff --git a/src/parser.cpp b/src/parser.cc index ca53486..5e2293c 100644 --- a/src/parser.cpp +++ b/src/parser.cc @@ -2,7 +2,7 @@ #include <typeinfo> #include <langinfo.h> -#include "parser.hpp" +#include "parser.h" static void append_or_delete( Parser::Action *act, std::list<Parser::Action *>&vec ) diff --git a/src/parser.hpp b/src/parser.h index d70f83c..83ba2b1 100644 --- a/src/parser.hpp +++ b/src/parser.h @@ -8,10 +8,10 @@ #include <list> #include <string.h> -#include "parsertransition.hpp" -#include "parseraction.hpp" -#include "parserstate.hpp" -#include "parserstatefamily.hpp" +#include "parsertransition.h" +#include "parseraction.h" +#include "parserstate.h" +#include "parserstatefamily.h" #ifndef __STDC_ISO_10646__ #error "Must have __STDC_ISO_10646__" diff --git a/src/parseraction.cpp b/src/parseraction.cc index ccf128b..1e78c86 100644 --- a/src/parseraction.cpp +++ b/src/parseraction.cc @@ -1,8 +1,8 @@ #include <stdio.h> #include <wctype.h> -#include "parseraction.hpp" -#include "terminal.hpp" +#include "parseraction.h" +#include "terminal.h" using namespace Parser; diff --git a/src/parseraction.hpp b/src/parseraction.h index 34414c5..34414c5 100644 --- a/src/parseraction.hpp +++ b/src/parseraction.h diff --git a/src/parserstate.cpp b/src/parserstate.cc index 0dbe55c..e98d96a 100644 --- a/src/parserstate.cpp +++ b/src/parserstate.cc @@ -1,5 +1,5 @@ -#include "parserstate.hpp" -#include "parserstatefamily.hpp" +#include "parserstate.h" +#include "parserstatefamily.h" using namespace Parser; diff --git a/src/parserstate.hpp b/src/parserstate.h index c344a00..3d63d82 100644 --- a/src/parserstate.hpp +++ b/src/parserstate.h @@ -1,7 +1,7 @@ #ifndef PARSERSTATE_HPP #define PARSERSTATE_HPP -#include "parsertransition.hpp" +#include "parsertransition.h" namespace Parser { class StateFamily; diff --git a/src/parserstatefamily.hpp b/src/parserstatefamily.h index 14e1267..863da52 100644 --- a/src/parserstatefamily.hpp +++ b/src/parserstatefamily.h @@ -1,7 +1,7 @@ #ifndef PARSERSTATEFAMILY_HPP #define PARSERSTATEFAMILY_HPP -#include "parserstate.hpp" +#include "parserstate.h" namespace Parser { class StateFamily diff --git a/src/parsertransition.hpp b/src/parsertransition.h index 4d22998..9764b11 100644 --- a/src/parsertransition.hpp +++ b/src/parsertransition.h @@ -3,7 +3,7 @@ #include <stdlib.h> -#include "parseraction.hpp" +#include "parseraction.h" namespace Parser { class State; diff --git a/src/stmclient.cpp b/src/stmclient.cc index 0d6881f..09f2768 100644 --- a/src/stmclient.cpp +++ b/src/stmclient.cc @@ -13,12 +13,12 @@ #include <sys/signalfd.h> #include <time.h> -#include "stmclient.hpp" -#include "swrite.hpp" -#include "completeterminal.hpp" -#include "user.hpp" +#include "stmclient.h" +#include "swrite.h" +#include "completeterminal.h" +#include "user.h" -#include "networktransport.cpp" +#include "networktransport.cc" void STMClient::init( void ) { diff --git a/src/stmclient.hpp b/src/stmclient.h index 1ff64a8..8ece6ec 100644 --- a/src/stmclient.hpp +++ b/src/stmclient.h @@ -5,10 +5,10 @@ #include <termios.h> #include <string> -#include "completeterminal.hpp" -#include "networktransport.hpp" -#include "user.hpp" -#include "terminaloverlay.hpp" +#include "completeterminal.h" +#include "networktransport.h" +#include "user.h" +#include "terminaloverlay.h" class STMClient { private: diff --git a/src/swrite.cpp b/src/swrite.cc index 2960971..a4451a4 100644 --- a/src/swrite.cpp +++ b/src/swrite.cc @@ -2,7 +2,7 @@ #include <string.h> #include <stdio.h> -#include "swrite.hpp" +#include "swrite.h" int swrite( int fd, const char *str, ssize_t len ) { diff --git a/src/swrite.hpp b/src/swrite.h index 8538d32..8538d32 100644 --- a/src/swrite.hpp +++ b/src/swrite.h diff --git a/src/terminal.cpp b/src/terminal.cc index 049f191..de5ea3d 100644 --- a/src/terminal.cpp +++ b/src/terminal.cc @@ -4,8 +4,8 @@ #include <unistd.h> #include <typeinfo> -#include "terminal.hpp" -#include "swrite.hpp" +#include "terminal.h" +#include "swrite.h" using namespace Terminal; diff --git a/src/terminal.hpp b/src/terminal.h index 4fbacfb..19d773a 100644 --- a/src/terminal.hpp +++ b/src/terminal.h @@ -6,11 +6,11 @@ #include <vector> #include <deque> -#include "parseraction.hpp" -#include "terminalframebuffer.hpp" -#include "terminaldispatcher.hpp" -#include "terminaluserinput.hpp" -#include "terminaldisplay.hpp" +#include "parseraction.h" +#include "terminalframebuffer.h" +#include "terminaldispatcher.h" +#include "terminaluserinput.h" +#include "terminaldisplay.h" namespace Terminal { class Emulator { diff --git a/src/terminaldispatcher.cpp b/src/terminaldispatcher.cc index 7a23217..7c36508 100644 --- a/src/terminaldispatcher.cpp +++ b/src/terminaldispatcher.cc @@ -2,9 +2,9 @@ #include <assert.h> #include <string.h> -#include "terminaldispatcher.hpp" -#include "parseraction.hpp" -#include "terminalframebuffer.hpp" +#include "terminaldispatcher.h" +#include "parseraction.h" +#include "terminalframebuffer.h" using namespace Terminal; diff --git a/src/terminaldispatcher.hpp b/src/terminaldispatcher.h index 714645c..714645c 100644 --- a/src/terminaldispatcher.hpp +++ b/src/terminaldispatcher.h diff --git a/src/terminaldisplay.cpp b/src/terminaldisplay.cc index 3faa062..4a98b7d 100644 --- a/src/terminaldisplay.cpp +++ b/src/terminaldisplay.cc @@ -1,6 +1,6 @@ #include <assert.h> -#include "terminaldisplay.hpp" +#include "terminaldisplay.h" using namespace Terminal; diff --git a/src/terminaldisplay.hpp b/src/terminaldisplay.h index c7949dd..b62ddd8 100644 --- a/src/terminaldisplay.hpp +++ b/src/terminaldisplay.h @@ -1,7 +1,7 @@ #ifndef TERMINALDISPLAY_HPP #define TERMINALDISPLAY_HPP -#include "terminalframebuffer.hpp" +#include "terminalframebuffer.h" namespace Terminal { /* variables used within a new_frame */ diff --git a/src/terminalframebuffer.cpp b/src/terminalframebuffer.cc index 30a0067..13cc6d9 100644 --- a/src/terminalframebuffer.cpp +++ b/src/terminalframebuffer.cc @@ -1,6 +1,6 @@ #include <assert.h> -#include "terminalframebuffer.hpp" +#include "terminalframebuffer.h" using namespace Terminal; diff --git a/src/terminalframebuffer.hpp b/src/terminalframebuffer.h index 6c564e0..6c564e0 100644 --- a/src/terminalframebuffer.hpp +++ b/src/terminalframebuffer.h diff --git a/src/terminalfunctions.cpp b/src/terminalfunctions.cc index 77ff531..e01830c 100644 --- a/src/terminalfunctions.cpp +++ b/src/terminalfunctions.cc @@ -1,9 +1,9 @@ #include <unistd.h> #include <string> -#include "terminaldispatcher.hpp" -#include "terminalframebuffer.hpp" -#include "parseraction.hpp" +#include "terminaldispatcher.h" +#include "terminalframebuffer.h" +#include "parseraction.h" using namespace Terminal; diff --git a/src/terminaloverlay.cpp b/src/terminaloverlay.cc index 8b44899..99b457e 100644 --- a/src/terminaloverlay.cpp +++ b/src/terminaloverlay.cc @@ -4,7 +4,7 @@ #include <typeinfo> #include <limits.h> -#include "terminaloverlay.hpp" +#include "terminaloverlay.h" using namespace Overlay; diff --git a/src/terminaloverlay.hpp b/src/terminaloverlay.h index 9627eee..3012736 100644 --- a/src/terminaloverlay.hpp +++ b/src/terminaloverlay.h @@ -1,9 +1,9 @@ #ifndef TERMINAL_OVERLAY_HPP #define TERMINAL_OVERLAY_HPP -#include "terminalframebuffer.hpp" -#include "network.hpp" -#include "parser.hpp" +#include "terminalframebuffer.h" +#include "network.h" +#include "parser.h" #include <vector> diff --git a/src/terminaluserinput.cpp b/src/terminaluserinput.cc index e5088b1..45efe38 100644 --- a/src/terminaluserinput.cpp +++ b/src/terminaluserinput.cc @@ -1,4 +1,4 @@ -#include "terminaluserinput.hpp" +#include "terminaluserinput.h" using namespace Terminal; diff --git a/src/terminaluserinput.hpp b/src/terminaluserinput.h index 1052a87..738f6dc 100644 --- a/src/terminaluserinput.hpp +++ b/src/terminaluserinput.h @@ -2,7 +2,7 @@ #define TERMINALUSERINPUT_HPP #include <string> -#include "parseraction.hpp" +#include "parseraction.h" namespace Terminal { class UserInput { diff --git a/src/transportfragment.cpp b/src/transportfragment.cc index 590219b..dce353f 100644 --- a/src/transportfragment.cpp +++ b/src/transportfragment.cc @@ -1,7 +1,7 @@ #include <endian.h> #include <assert.h> -#include "transportfragment.hpp" +#include "transportfragment.h" #include "transportinstruction.pb.h" using namespace Network; diff --git a/src/transportfragment.hpp b/src/transportfragment.h index 34fac53..34fac53 100644 --- a/src/transportfragment.hpp +++ b/src/transportfragment.h diff --git a/src/transportsender.cpp b/src/transportsender.cc index bb2b742..f0a2e1f 100644 --- a/src/transportsender.cpp +++ b/src/transportsender.cc @@ -1,8 +1,8 @@ #include <algorithm> #include <list> -#include "transportsender.hpp" -#include "transportfragment.hpp" +#include "transportsender.h" +#include "transportfragment.h" using namespace Network; diff --git a/src/transportsender.hpp b/src/transportsender.h index c823e26..7f0d39d 100644 --- a/src/transportsender.hpp +++ b/src/transportsender.h @@ -5,10 +5,10 @@ #include <string> #include <list> -#include "network.hpp" +#include "network.h" #include "transportinstruction.pb.h" -#include "transportstate.hpp" -#include "transportfragment.hpp" +#include "transportstate.h" +#include "transportfragment.h" using namespace std; using namespace TransportBuffers; diff --git a/src/transportstate.hpp b/src/transportstate.h index b9e4c5b..b9e4c5b 100644 --- a/src/transportstate.hpp +++ b/src/transportstate.h diff --git a/src/user.cpp b/src/user.cc index ce666e9..3957660 100644 --- a/src/user.cpp +++ b/src/user.cc @@ -1,7 +1,7 @@ #include <assert.h> #include <typeinfo> -#include "user.hpp" +#include "user.h" #include "userinput.pb.h" using namespace Parser; diff --git a/src/user.hpp b/src/user.h index 1d6afed..17a127b 100644 --- a/src/user.hpp +++ b/src/user.h @@ -6,7 +6,7 @@ #include <string> #include <assert.h> -#include "parseraction.hpp" +#include "parseraction.h" using namespace std; |