Commit 8098d941 authored by Frank Meier's avatar Frank Meier Committed by Daniel Stenberg
Browse files

getinfo: added *_PRIMARY_PORT, *_LOCAL_IP and *_LOCAL_PORT

parent 605207a3
Loading
Loading
Loading
Loading
+4 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,10 @@


                                  Changelog
                                  Changelog


Daniel Stenberg (5 June 2010)
- Frank Meier added CURLINFO_PRIMARY_PORT, CURLINFO_LOCAL_IP and
  CURLINFO_LOCAL_PORT to curl_easy_getinfo().

Yang Tse (4 June 2010)
Yang Tse (4 June 2010)
- Enabled OpenLDAP support for cygwin builds. This support was disabled back
- Enabled OpenLDAP support for cygwin builds. This support was disabled back
  in 2008 due to incompatibilities between OpenSSL and OpenLDAP headers.
  in 2008 due to incompatibilities between OpenSSL and OpenLDAP headers.
+3 −1
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ This release includes the following changes:
 o added support for RTMP
 o added support for RTMP
 o introducing new LDAP code for new enough OpenLDAP
 o introducing new LDAP code for new enough OpenLDAP
 o OpenLDAP support enabled for cygwin builds
 o OpenLDAP support enabled for cygwin builds
 o added CURLINFO_PRIMARY_PORT, CURLINFO_LOCAL_IP and CURLINFO_LOCAL_PORT


This release includes the following bugfixes:
This release includes the following bugfixes:


@@ -48,6 +49,7 @@ advice from friends like these:
 Kamil Dudka, Alex Bligh, Ben Greear, Hoi-Ho Chan, Howard Chu, Dirk Manske,
 Kamil Dudka, Alex Bligh, Ben Greear, Hoi-Ho Chan, Howard Chu, Dirk Manske,
 Pavel Raiskup, John-Mark Bell, Eric Mertens, Tor Arntsen, Douglas Kilpatrick,
 Pavel Raiskup, John-Mark Bell, Eric Mertens, Tor Arntsen, Douglas Kilpatrick,
 Igor Novoseltsev, Jason McDonald, Dan Fandrich, Tanguy Fautre, Guenter Knauf,
 Igor Novoseltsev, Jason McDonald, Dan Fandrich, Tanguy Fautre, Guenter Knauf,
 Julien Chaffraix, Kalle Vahlman
 Julien Chaffraix, Kalle Vahlman, Frank Meier



        Thanks! (and sorry if I forgot to mention someone)
        Thanks! (and sorry if I forgot to mention someone)
+11 −0
Original line number Original line Diff line number Diff line
@@ -173,6 +173,17 @@ string holding the IP address of the most recent connection done with this
\fBcurl\fP handle. This string may be IPv6 if that's enabled. Note that you
\fBcurl\fP handle. This string may be IPv6 if that's enabled. Note that you
get a pointer to a memory area that will be re-used at next request so you
get a pointer to a memory area that will be re-used at next request so you
need to copy the string if you want to keep the information. (Added in 7.19.0)
need to copy the string if you want to keep the information. (Added in 7.19.0)
.IP CURLINFO_PRIMARY_PORT
Pass a pointer to a long to receive the destination port of the most recent
connection done with this \fBcurl\fP handle. (Added in 7.21.0)
.IP CURLINFO_LOCAL_IP
Pass a pointer to a char pointer to receive the pointer to a zero-terminated
string holding the local (source) IP address of the most recent connection done
with this \fBcurl\fP handle. This string may be IPv6 if that's enabled. The
same restrictions apply as to \fICURLINFO_PRIMARY_IP\fP. (Added in 7.21.0)
.IP CURLINFO_LOCAL_PORT
Pass a pointer to a long to receive the local (source) port of the most recent
connection done with this \fBcurl\fP handle. (Added in 7.21.0)
.IP CURLINFO_COOKIELIST
.IP CURLINFO_COOKIELIST
Pass a pointer to a 'struct curl_slist *' to receive a linked-list of all
Pass a pointer to a 'struct curl_slist *' to receive a linked-list of all
cookies cURL knows (expired ones, too). Don't forget to
cookies cURL knows (expired ones, too). Don't forget to
+9 −6
Original line number Original line Diff line number Diff line
@@ -151,11 +151,14 @@ CURLINFO_HTTPAUTH_AVAIL 7.10.8
CURLINFO_HTTP_CODE              7.4.1         7.10.8
CURLINFO_HTTP_CODE              7.4.1         7.10.8
CURLINFO_HTTP_CONNECTCODE       7.10.7
CURLINFO_HTTP_CONNECTCODE       7.10.7
CURLINFO_LASTSOCKET             7.15.2
CURLINFO_LASTSOCKET             7.15.2
CURLINFO_LOCAL_IP               7.21.0
CURLINFO_LOCAL_PORT             7.21.0
CURLINFO_NAMELOOKUP_TIME        7.4.1
CURLINFO_NAMELOOKUP_TIME        7.4.1
CURLINFO_NUM_CONNECTS           7.12.3
CURLINFO_NUM_CONNECTS           7.12.3
CURLINFO_OS_ERRNO               7.12.2
CURLINFO_OS_ERRNO               7.12.2
CURLINFO_PRETRANSFER_TIME       7.4.1
CURLINFO_PRETRANSFER_TIME       7.4.1
CURLINFO_PRIMARY_IP             7.19.0
CURLINFO_PRIMARY_IP             7.19.0
CURLINFO_PRIMARY_PORT           7.21.0
CURLINFO_PRIVATE                7.10.3
CURLINFO_PRIVATE                7.10.3
CURLINFO_PRIVATE                7.10.3
CURLINFO_PRIVATE                7.10.3
CURLINFO_PROXYAUTH_AVAIL        7.10.8
CURLINFO_PROXYAUTH_AVAIL        7.10.8
@@ -402,6 +405,12 @@ CURLPROTO_LDAP 7.19.4
CURLPROTO_LDAPS                 7.19.4
CURLPROTO_LDAPS                 7.19.4
CURLPROTO_POP3                  7.20.0
CURLPROTO_POP3                  7.20.0
CURLPROTO_POP3S                 7.20.0
CURLPROTO_POP3S                 7.20.0
CURLPROTO_RTMP                  7.21.0
CURLPROTO_RTMPE                 7.21.0
CURLPROTO_RTMPS                 7.21.0
CURLPROTO_RTMPT                 7.21.0
CURLPROTO_RTMPTE                7.21.0
CURLPROTO_RTMPTS                7.21.0
CURLPROTO_RTSP                  7.20.0
CURLPROTO_RTSP                  7.20.0
CURLPROTO_SCP                   7.19.4
CURLPROTO_SCP                   7.19.4
CURLPROTO_SFTP                  7.19.4
CURLPROTO_SFTP                  7.19.4
@@ -415,12 +424,6 @@ CURLPROXY_SOCKS4 7.10
CURLPROXY_SOCKS4A               7.18.0
CURLPROXY_SOCKS4A               7.18.0
CURLPROXY_SOCKS5                7.10
CURLPROXY_SOCKS5                7.10
CURLPROXY_SOCKS5_HOSTNAME       7.18.0
CURLPROXY_SOCKS5_HOSTNAME       7.18.0
CURLPROTO_RTMP                  7.21.0
CURLPROTO_RTMPT                 7.21.0
CURLPROTO_RTMPE                 7.21.0
CURLPROTO_RTMPTE                7.21.0
CURLPROTO_RTMPS                 7.21.0
CURLPROTO_RTMPTS                7.21.0
CURLSSH_AUTH_DEFAULT            7.16.1
CURLSSH_AUTH_DEFAULT            7.16.1
CURLSSH_AUTH_HOST               7.16.1
CURLSSH_AUTH_HOST               7.16.1
CURLSSH_AUTH_KEYBOARD           7.16.1
CURLSSH_AUTH_KEYBOARD           7.16.1
+4 −1
Original line number Original line Diff line number Diff line
@@ -1883,9 +1883,12 @@ typedef enum {
  CURLINFO_RTSP_CLIENT_CSEQ = CURLINFO_LONG   + 37,
  CURLINFO_RTSP_CLIENT_CSEQ = CURLINFO_LONG   + 37,
  CURLINFO_RTSP_SERVER_CSEQ = CURLINFO_LONG   + 38,
  CURLINFO_RTSP_SERVER_CSEQ = CURLINFO_LONG   + 38,
  CURLINFO_RTSP_CSEQ_RECV   = CURLINFO_LONG   + 39,
  CURLINFO_RTSP_CSEQ_RECV   = CURLINFO_LONG   + 39,
  CURLINFO_PRIMARY_PORT     = CURLINFO_LONG   + 40,
  CURLINFO_LOCAL_IP         = CURLINFO_STRING + 41,
  CURLINFO_LOCAL_PORT       = CURLINFO_LONG   + 42,
  /* Fill in new entries below here! */
  /* Fill in new entries below here! */


  CURLINFO_LASTONE          = 39
  CURLINFO_LASTONE          = 42
} CURLINFO;
} CURLINFO;


/* CURLINFO_RESPONSE_CODE is the new name for the option previously known as
/* CURLINFO_RESPONSE_CODE is the new name for the option previously known as
Loading