oo-70-245-1 Commit Details

Date:

2018-10-18 22:30:15 (6 years 2 months ago)

Author:

Natalie Adams

Branch:

master

Commit:

7a54e90e5b07055639e9b0b77ad13a44898e80d8

Parents:

9133efac475f71a7cd7960929cbfbd9d4f914ee3

Message:

adding comments

Changes:

File differences

-31
32 32
33 33
34 
34
35 35
36 
36
37 37
38 38
39 39
... ...
44 44
45 45
46 46
47 
47
48 48
49 49
50 
50
51 51
52 52
53 53
+        public Server(IPAddress ip, int port = 5000)␍␊
        {␍␊
            server = new TcpListener(ip, port);␍␊
            server.Start();␍␊
            server.Start(); // Start listening on given IP and port␍␊
            Console.WriteLine("Listening on {0} on port {1}", ip.ToString(), port);␍␊
            s = server.AcceptSocket();␍␊
            s = server.AcceptSocket(); // Accept the connection as a socket into s␍␊
        }␍␊
␍␊
        public Server(int port = 5000) : this(IPAddress.Loopback, port) { }␍␊

            byte[] buffer = new byte[1024];␍␊
            byte[] pong = "pong".ToByteArray();␍␊
            ␍␊
            int k = s.Receive(buffer);␍␊
            int k = s.Receive(buffer); // receive data from client␍␊
            Console.WriteLine("Client sent - {0} - {1}", buffer.GetString(k), count);␍␊
            Thread.Sleep(2000);␍␊
            s.Send(pong);␍␊
            s.Send(pong); // send data to client␍␊
            Console.WriteLine("Sent to client - {0} - {1}", pong.GetString(pong.Length), count);␍␊
            count++;␍␊
            return true;␍␊
 ...
         public Server(IPAddress ip, int port = 5000)␍␊
         {␍␊
             server = new TcpListener(ip, port);␍␊
-            server.Start();␍␊
+            server.Start(); // Start listening on given IP and port␍␊
             Console.WriteLine("Listening on {0} on port {1}", ip.ToString(), port);␍␊
-            s = server.AcceptSocket();␍␊
+            s = server.AcceptSocket(); // Accept the connection as a socket into s␍␊
         }␍␊
 ␍␊
         public Server(int port = 5000) : this(IPAddress.Loopback, port) { }␍␊
             byte[] buffer = new byte[1024];␍␊
             byte[] pong = "pong".ToByteArray();␍␊
             ␍␊
-            int k = s.Receive(buffer);␍␊
+            int k = s.Receive(buffer); // receive data from client␍␊
             Console.WriteLine("Client sent - {0} - {1}", buffer.GetString(k), count);␍␊
             Thread.Sleep(2000);␍␊
-            s.Send(pong);␍␊
+            s.Send(pong); // send data to client␍␊
             Console.WriteLine("Sent to client - {0} - {1}", pong.GetString(pong.Length), count);␍␊
             count++;␍␊
             return true;␍␊

-37
38 38
39 39
40
41
42
40 43
41 44
42 45
+            while (true)␍␊
            {␍␊
                s = server.AcceptSocket();␍␊
␉␉␉␉// spin up a new thread that handles␍␊
␉␉␉␉// incoming data from that client␍␊
␉␉␉␉// then loop to accept another connection␍␊
                Thread t = new Thread(Respond);␍␊
                t.Start(s);␍␊
            }␍␊
             while (true)␍␊
             {␍␊
                 s = server.AcceptSocket();␍␊
+␉␉␉␉// spin up a new thread that handles␍␊
+␉␉␉␉// incoming data from that client␍␊
+␉␉␉␉// then loop to accept another connection␍␊
                 Thread t = new Thread(Respond);␍␊
                 t.Start(s);␍␊
             }␍␊

-26
27 27
28 28
29
30
31
29 32
30 33
31 34
... ...
39 42
40 43
41 44
45
42 46
43 47
44 48
+                {␍␊
                    Thread t = new Thread(handleConnection);␍␊
                    Socket client = server.AcceptSocket();␍␊
␉␉␉␉␉// Send the socket to the thread ␍␊
␉␉␉␉␉// let the thread deal with incoming messages␍␊
␉␉␉␉␉// loop and accept the next connection and repeat␍␊
                    t.Start(client);␍␊
␍␊
                }␍␊

        }␍␊
        static void handleConnection(object socket)␍␊
        {␍␊
␉␉␉// unbox/cast socket object type to a Socket type␍␊
            Socket client = (Socket)socket;␍␊
␍␊
            Console.WriteLine("Connection accepted from {0}", client.RemoteEndPoint);␍␊
 ...
                 {␍␊
                     Thread t = new Thread(handleConnection);␍␊
                     Socket client = server.AcceptSocket();␍␊
+␉␉␉␉␉// Send the socket to the thread ␍␊
+␉␉␉␉␉// let the thread deal with incoming messages␍␊
+␉␉␉␉␉// loop and accept the next connection and repeat␍␊
                     t.Start(client);␍␊
 ␍␊
                 }␍␊
         }␍␊
         static void handleConnection(object socket)␍␊
         {␍␊
+␉␉␉// unbox/cast socket object type to a Socket type␍␊
             Socket client = (Socket)socket;␍␊
 ␍␊
             Console.WriteLine("Connection accepted from {0}", client.RemoteEndPoint);␍␊

Download the corresponding diff file

oo-70-245-1

File differences

Branches