Commit 56d9624b authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

John Kelly added TFTP support to libcurl. A bunch of new error codes was 

added. TODO: add them to docs. add TFTP server to test suite. add TFTP to
list of protocols whereever those are mentioned.
parent 911d135d

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -7,6 +7,11 @@ 
                                  Changelog





Daniel (1 September 2005)

- John Kelly added TFTP support to libcurl. A bunch of new error codes was

  added. TODO: add them to docs. add TFTP server to test suite. add TFTP to

  list of protocols whereever those are mentioned.



Version 7.14.1 (1 September 2005)



Daniel (29 August 2005)

configure.ac

+15 −0
Original line number Diff line number Diff line
@@ -251,6 +251,21 @@ AC_HELP_STRING([--disable-telnet],[Disable TELNET support]), 
  esac ],

       AC_MSG_RESULT(yes)

)

AC_MSG_CHECKING([whether to support tftp])

AC_ARG_ENABLE(tftp,

AC_HELP_STRING([--enable-tftp],[Enable TFTP support])

AC_HELP_STRING([--disable-tftp],[Disable TFTP support]),

[ case "$enableval" in

  no)

       AC_MSG_RESULT(no)

       AC_DEFINE(CURL_DISABLE_TFTP, 1, [to disable TFTP])

       AC_SUBST(CURL_DISABLE_TFTP, [1])

       ;;

  *)   AC_MSG_RESULT(yes)

       ;;

  esac ],

       AC_MSG_RESULT(yes)

)



dnl **********************************************************************

dnl Check for built-in manual

include/curl/curl.h

+7 −0
Original line number Diff line number Diff line
@@ -309,6 +309,13 @@ typedef enum { 
  CURLE_SSL_ENGINE_INITFAILED,   /* 66 - failed to initialise ENGINE */

  CURLE_LOGIN_DENIED,            /* 67 - user, password or similar was not

                                    accepted and we failed to login */

  CURLE_TFTP_NOTFOUND,           /* 68 - file not found on server */

  CURLE_TFTP_PERM,               /* 69 - permission problem on server */

  CURLE_TFTP_DISKFULL,           /* 70 - out of disk space on server */

  CURLE_TFTP_ILLEGAL,            /* 71 - Illegal TFTP operation */

  CURLE_TFTP_UNKNOWNID,          /* 72 - Unknown transfer ID */

  CURLE_TFTP_EXISTS,             /* 73 - File already exists */

  CURLE_TFTP_NOSUCHUSER,         /* 74 - No such user */

  CURL_LAST /* never use! */

} CURLcode;

lib/Makefile.inc

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ 
  content_encoding.c share.c http_digest.c md5.c http_negotiate.c	\

  http_ntlm.c inet_pton.c strtoofft.c strerror.c hostares.c hostasyn.c	\

  hostip4.c hostip6.c hostsyn.c hostthre.c inet_ntop.c parsedate.c	\

  select.c gtls.c sslgen.c

  select.c gtls.c sslgen.c tftp.c



HHEADERS = arpa_telnet.h netrc.h file.h timeval.h base64.h hostip.h	\

  progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h	\
@@ -18,5 +18,5 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h base64.h hostip.h \ 
  share.h md5.h http_digest.h http_negotiate.h http_ntlm.h ca-bundle.h	\

  inet_pton.h strtoofft.h strerror.h inet_ntop.h curlx.h memory.h	\

  setup.h transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h   \

  gtls.h

  gtls.h tftp.h

lib/connect.c

+7 −2
Original line number Diff line number Diff line
@@ -660,7 +660,12 @@ singleipconnect(struct connectdata *conn, 
  /* set socket non-blocking */

  Curl_nonblock(sockfd, TRUE);



  /* Connect TCP sockets, bind UDP */

  if(ai->ai_socktype==SOCK_STREAM) {

    rc = connect(sockfd, ai->ai_addr, (socklen_t)ai->ai_addrlen);

  } else {

    rc = 0;

  }

	

  if(-1 == rc) {

    error = Curl_ourerrno();