From 557658776ffb63c5f008d8bddfd7958e616d789b Mon Sep 17 00:00:00 2001 From: Bill Nagel Date: Sat, 29 Nov 2014 14:19:23 -0500 Subject: [PATCH] smb: Added SMB protocol and port definitions Added the necessary protocol and port definitions in order to support SMB/CIFS. --- docs/libcurl/symbols-in-versions | 2 ++ include/curl/curl.h | 2 ++ lib/urldata.h | 3 +++ packages/OS400/curl.inc.in | 4 ++++ 4 files changed, 11 insertions(+) diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions index 8e4ca9cea..642cc19f4 100644 --- a/docs/libcurl/symbols-in-versions +++ b/docs/libcurl/symbols-in-versions @@ -574,6 +574,8 @@ CURLPROTO_RTMPTS 7.21.0 CURLPROTO_RTSP 7.20.0 CURLPROTO_SCP 7.19.4 CURLPROTO_SFTP 7.19.4 +CURLPROTO_SMB 7.40.0 +CURLPROTO_SMBS 7.40.0 CURLPROTO_SMTP 7.20.0 CURLPROTO_SMTPS 7.20.0 CURLPROTO_TELNET 7.19.4 diff --git a/include/curl/curl.h b/include/curl/curl.h index 90d0251a0..5ed4c3ea5 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -805,6 +805,8 @@ typedef enum { #define CURLPROTO_RTMPS (1<<23) #define CURLPROTO_RTMPTS (1<<24) #define CURLPROTO_GOPHER (1<<25) +#define CURLPROTO_SMB (1<<26) +#define CURLPROTO_SMBS (1<<27) #define CURLPROTO_ALL (~0) /* enable everything */ /* long may be 32 or 64 bits, but we should never depend on anything else diff --git a/lib/urldata.h b/lib/urldata.h index d0746b41f..97796b75c 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -40,6 +40,8 @@ #define PORT_IMAPS 993 #define PORT_POP3 110 #define PORT_POP3S 995 +#define PORT_SMB 445 +#define PORT_SMBS 445 #define PORT_SMTP 25 #define PORT_SMTPS 465 /* sometimes called SSMTP */ #define PORT_RTSP 554 @@ -64,6 +66,7 @@ #define PROTO_FAMILY_HTTP (CURLPROTO_HTTP|CURLPROTO_HTTPS) #define PROTO_FAMILY_FTP (CURLPROTO_FTP|CURLPROTO_FTPS) #define PROTO_FAMILY_POP3 (CURLPROTO_POP3|CURLPROTO_POP3S) +#define PROTO_FAMILY_SMB (CURLPROTO_SMB|CURLPROTO_SMBS) #define PROTO_FAMILY_SMTP (CURLPROTO_SMTP|CURLPROTO_SMTPS) #define DEFAULT_CONNCACHE_SIZE 5 diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index 2f6d86abc..bc4d848f5 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -779,6 +779,10 @@ d c X'01000000' d CURLPROTO_GOPHER... d c X'02000000' + d CURLPROTO_SMB... + d c X'04000000' + d CURLPROTO_SMBS... + d c X'08000000' * d CURLoption s 10i 0 based(######ptr######) Enum d CURLOPT_WRITEDATA...