From 57c3760a7cbda7d2fbfb2e77feb10c159d21c8fa Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Tue, 7 Jun 2016 15:58:09 +0000
Subject: [PATCH] Updates the Nsock examples, closes #395

---
 nsock/examples/nsock_telnet.c      | 12 ++++++------
 nsock/examples/nsock_test_timers.c |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nsock/examples/nsock_telnet.c b/nsock/examples/nsock_telnet.c
index 972247a83..e2e41354f 100644
--- a/nsock/examples/nsock_telnet.c
+++ b/nsock/examples/nsock_telnet.c
@@ -127,10 +127,10 @@ void telnet_event_handler(nsock_pool nsp, nsock_event nse, void *mydata) {
     switch (type) {
     case NSE_TYPE_CONNECT:
     case NSE_TYPE_CONNECT_SSL:
-      nsi_getlastcommunicationinfo(nsi, NULL, NULL, NULL, (struct sockaddr *)&peer, sizeof peer);
-      printf("Successfully connected %sto %s:%hu -- start typing lines\n", (type == NSE_TYPE_CONNECT_SSL) ? "(SSL!) " : "", inet_ntoa(peer.sin_addr), peer.sin_port);
+      nsock_iod_get_communication_info(nsi, NULL, NULL, NULL, (struct sockaddr *)&peer, sizeof peer);
+      printf("Successfully connected %sto %s:%hu -- start typing lines\n", (type == NSE_TYPE_CONNECT_SSL) ? "(SSL!) " : "", inet_ntoa(peer.sin_addr), ntohs(peer.sin_port));
       /* First of all, lets add STDIN to our list of watched filehandles */
-      if ((ts->stdin_nsi = nsi_new2(nsp, STDIN_FILENO, NULL)) == NULL) {
+      if ((ts->stdin_nsi = nsock_iod_new2(nsp, STDIN_FILENO, NULL)) == NULL) {
         fprintf(stderr, "Failed to create stdin msi\n");
         exit(1);
       }
@@ -172,7 +172,7 @@ void telnet_event_handler(nsock_pool nsp, nsock_event nse, void *mydata) {
       printf("Cancelled stdin event: %li\n", ts->latest_readstdinev);
     }
   } else if (status == NSE_STATUS_ERROR) {
-    if (nsi_checkssl(nsi)) {
+    if (nsock_iod_check_ssl(nsi)) {
       printf("SSL %s failed: %s\n", nse_type2str(type), ERR_error_string(ERR_get_error(), NULL));
     } else {
       int err;
@@ -230,14 +230,14 @@ int main(int argc, char *argv[]) {
     portno = 23;
 
   /* OK, we start with creating a p00l */
-  if ((nsp = nsp_new(NULL)) == NULL) {
+  if ((nsp = nsock_pool_new(NULL)) == NULL) {
     fprintf(stderr, "Failed to create new pool.  QUITTING.\n");
     exit(1);
   }
 
   gettimeofday(&now, NULL);
 
-  if ((ts.tcp_nsi = nsi_new(nsp, NULL)) == NULL) {
+  if ((ts.tcp_nsi = nsock_iod_new(nsp, NULL)) == NULL) {
     fprintf(stderr, "Failed to create new nsock_iod.  QUITTING.\n");
     exit(1);
   }
diff --git a/nsock/examples/nsock_test_timers.c b/nsock/examples/nsock_test_timers.c
index 168c8a767..f2ea8c04e 100644
--- a/nsock/examples/nsock_test_timers.c
+++ b/nsock/examples/nsock_test_timers.c
@@ -81,7 +81,7 @@ nsock_event_id request_timer(nsock_pool nsp, nsock_ev_handler handler, int timeo
 
 }
 
-int try_cancel_timer(nsock_pool * nsp, int idx, int notify) {
+int try_cancel_timer(nsock_pool nsp, int idx, int notify) {
   int res;
 
   printf("%ld:Attempting to cancel id %li (idx %d) %s notify.\n", time(NULL), ev_ids[idx], idx, ((notify) ? "WITH" : "WITHOUT"));
@@ -134,7 +134,7 @@ int main(int argc, char *argv[]) {
 
   srand(time(NULL));
   /* OK, we start with creating a p00l */
-  if ((nsp = nsp_new(NULL)) == NULL) {
+  if ((nsp = nsock_pool_new(NULL)) == NULL) {
     fprintf(stderr, "Failed to create new pool.  QUITTING.\n");
     exit(1);
   }
@@ -159,7 +159,7 @@ int main(int argc, char *argv[]) {
     }
   }
   printf("Trying to kill my msp!\n");
-  nsp_delete(nsp);
+  nsock_pool_delete(nsp);
   printf("SUCCESS -- completed %d l00ps.\n", num_loops);
 
   return 0;