Convert new/delete to shared_ptr.

src/frontend/mosh-server.cc

@@ -417,7 +417,8 @@ static int run_server( const char *desired_ip, const char *desired_port,
 
   /* open network */
   Network::UserStream blank;
-  ServerConnection *network = new ServerConnection( terminal, blank, desired_ip, desired_port );
+  typedef shared::shared_ptr<ServerConnection> NetworkPointer;
+  NetworkPointer network( new ServerConnection( terminal, blank, desired_ip, desired_port ) );
 
   network->set_verbose( verbose );
   Select::set_verbose( verbose );
@@ -521,7 +522,7 @@ static int run_server( const char *desired_ip, const char *desired_port,
     fatal_assert( 0 == sigaction( SIGPIPE, &sa, NULL ) );
 
     /* close server-related file descriptors */
-    delete network;
+    network.reset();
 
     /* set IUTF8 if available */
 #ifdef HAVE_IUTF8
@@ -628,8 +629,6 @@ static int run_server( const char *desired_ip, const char *desired_port,
       perror( "close" );
       exit( 1 );
     }
-
-    delete network;
   }
 
   fputs( "\n[mosh-server is exiting.]\n", stdout );

src/frontend/stmclient.cc

@@ -252,8 +252,7 @@ void STMClient::main_init( void )
   /* open network */
   Network::UserStream blank;
   Terminal::Complete local_terminal( window_size.ws_col, window_size.ws_row );
-  network = new Network::Transport< Network::UserStream, Terminal::Complete >( blank, local_terminal,
-									       key.c_str(), ip.c_str(), port.c_str() );
+  network = NetworkPointer( new NetworkType( blank, local_terminal, key.c_str(), ip.c_str(), port.c_str() ) );
 
   network->set_send_delay( 1 ); /* minimal delay on outgoing keystrokes */
 

src/frontend/stmclient.h

@@ -40,6 +40,7 @@
 #include "completeterminal.h"
 #include "networktransport.h"
 #include "user.h"
+#include "shared.h"
 #include "terminaloverlay.h"
 
 class STMClient {
@@ -60,7 +61,9 @@ private:
 
   Terminal::Framebuffer local_framebuffer, new_state;
   Overlay::OverlayManager overlays;
-  Network::Transport< Network::UserStream, Terminal::Complete > *network;
+  typedef Network::Transport< Network::UserStream, Terminal::Complete > NetworkType;
+  typedef shared::shared_ptr< NetworkType > NetworkPointer;
+  NetworkPointer network;
   Terminal::Display display;
 
   std::wstring connecting_notification;
@@ -94,7 +97,7 @@ public:
       local_framebuffer( 1, 1 ),
       new_state( 1, 1 ),
       overlays(),
-      network( NULL ),
+      network(),
       display( true ), /* use TERM environment var to initialize display */
       connecting_notification(),
       repaint_requested( false ),
@@ -126,13 +129,6 @@ public:
   void shutdown( void );
   bool main( void );
 
-  ~STMClient()
-  {
-    if ( network != NULL ) {
-      delete network;
-    }
-  }
-
   /* unused */
   STMClient( const STMClient & );
   STMClient & operator=( const STMClient & );