From 6d545730ba5dcb0c014029e8d7889b50e9512fc9 Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Thu, 5 Mar 2009 23:56:56 +0000
Subject: [PATCH] Added a telnet_connect() function

---
 apps/telnet/telnet.c | 45 +++++++++++++++++++++++++++-----------------
 apps/telnet/telnet.h | 26 +++++++++++++------------
 2 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/apps/telnet/telnet.c b/apps/telnet/telnet.c
index 72f8bb5d2..ea703d877 100644
--- a/apps/telnet/telnet.c
+++ b/apps/telnet/telnet.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (c) 2002, Adam Dunkels.
- * All rights reserved. 
+ * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in the 
- *    documentation and/or other materials provided with the distribution. 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
- *    written permission.  
+ *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -24,11 +24,11 @@
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: telnet.c,v 1.1 2006/06/17 22:41:13 adamdunkels Exp $
+ * $Id: telnet.c,v 1.2 2009/03/05 23:56:56 adamdunkels Exp $
  *
  */
 
@@ -50,7 +50,7 @@ telnet_send(struct telnet_state *s, char *text, u16_t len)
     return 1;
   }
   s->text = text;
-  s->textlen = len;  
+  s->textlen = len;
   s->sentlen = 0;
   return 0;
 }
@@ -76,7 +76,7 @@ telnet_abort(struct telnet_state *s)
 }
 /*-----------------------------------------------------------------------------------*/
 static void
-acked(struct telnet_state *s)    
+acked(struct telnet_state *s)
 {
   s->textlen -= s->sentlen;
   if(s->textlen == 0) {
@@ -89,7 +89,7 @@ acked(struct telnet_state *s)
 }
 /*-----------------------------------------------------------------------------------*/
 static void
-senddata(struct telnet_state *s)    
+senddata(struct telnet_state *s)
 {
   if(s->text == NULL) {
     uip_send(s->text, 0);
@@ -103,6 +103,18 @@ senddata(struct telnet_state *s)
   uip_send(s->text, s->sentlen);
 }
 /*-----------------------------------------------------------------------------------*/
+struct telnet_state *
+telnet_connect(struct telnet_state *s, uip_ipaddr_t *addr, u16_t port)
+{
+  struct uip_conn *conn;
+  
+  conn = tcp_connect(addr, htons(port), s);
+  if(conn == NULL) {
+    return NULL;
+  }
+  return s;
+}
+/*-----------------------------------------------------------------------------------*/
 void
 telnet_app(void *ts)
 {
@@ -126,7 +138,6 @@ telnet_app(void *ts)
     telnet_timedout(s);
   }
 
-
   if(s->flags & FLAG_CLOSE) {
     uip_close();
     return;
@@ -145,7 +156,7 @@ telnet_app(void *ts)
      uip_newdata() ||
      uip_acked()) {
     senddata(s);
-  } else if(uip_poll()) {    
+  } else if(uip_poll()) {
     senddata(s);
   }
 }
diff --git a/apps/telnet/telnet.h b/apps/telnet/telnet.h
index baaae1bc8..cb888a5a3 100644
--- a/apps/telnet/telnet.h
+++ b/apps/telnet/telnet.h
@@ -1,18 +1,18 @@
 /*
  * Copyright (c) 2002, Adam Dunkels.
- * All rights reserved. 
+ * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in the 
- *    documentation and/or other materials provided with the distribution. 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
- *    written permission.  
+ *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -24,11 +24,11 @@
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: telnet.h,v 1.1 2006/06/17 22:41:13 adamdunkels Exp $
+ * $Id: telnet.h,v 1.2 2009/03/05 23:56:56 adamdunkels Exp $
  *
  */
 #ifndef __TELNET_H__
@@ -48,6 +48,8 @@ void telnet_app(void *s);
 unsigned char telnet_send(struct telnet_state *s, char *text, u16_t len);
 unsigned char telnet_close(struct telnet_state *s);
 unsigned char telnet_abort(struct telnet_state *s);
+struct telnet_state *telnet_connect(struct telnet_state *s, uip_ipaddr_t *addr, u16_t port);
+
 
 /* Callbacks, implemented by the caller. */
 void telnet_connected(struct telnet_state *s);