Skip to content

Commit

Permalink
Revise missing DEPS and stubs
Browse files Browse the repository at this point in the history
  • Loading branch information
@hodduc
hodduc committed Dec 1, 2015
1 parent 2aac0d2 commit 1237e41
Show file tree
Hide file tree
Showing 16 changed files with 718 additions and 17 deletions.
25 changes: 25 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,12 @@ set(
src/net/quic/quic_flow_controller.cc
src/net/quic/quic_connection_stats.cc
src/net/quic/quic_fec_group.cc
src/net/quic/quic_fec_group_interface.cc
src/net/quic/quic_data_writer.cc
src/net/quic/quic_data_reader.cc
src/net/quic/quic_session.cc
src/net/quic/quic_spdy_session.cc
src/net/quic/quic_spdy_stream.cc
src/net/quic/iovector.cc
src/net/quic/quic_stream_sequencer.cc
src/net/quic/quic_framer.cc
Expand All @@ -89,6 +91,7 @@ set(
src/net/quic/quic_crypto_stream.cc
src/net/quic/quic_socket_address_coder.cc
src/net/quic/quic_utils.cc
src/net/quic/quic_frame_list.cc
src/net/quic/crypto/quic_crypto_server_config.cc
src/net/quic/crypto/crypto_handshake_message.cc
src/net/quic/crypto/p256_key_exchange_openssl.cc
Expand Down Expand Up @@ -145,19 +148,32 @@ set(
src/net/quic/quic_server_id.cc
src/net/quic/proto/cached_network_parameters.pb.cc
src/net/quic/proto/source_address_token.pb.cc
src/net/quic/stream_sequencer_buffer.cc

src/net/base/int128.cc
src/net/base/io_buffer.cc
src/net/base/net_util.cc
src/net/base/net_errors.cc
src/net/base/ip_endpoint.cc
src/net/base/host_port_pair.cc
src/net/base/port_util.cc
src/net/base/address_family.cc

src/net/spdy/spdy_frame_reader.cc
src/net/spdy/spdy_frame_builder.cc
src/net/spdy/spdy_framer.cc
src/net/spdy/spdy_header_block.cc
src/net/spdy/spdy_protocol.cc
src/net/spdy/spdy_alt_svc_wire_format.cc
src/net/spdy/hpack/hpack_constants.cc
src/net/spdy/hpack/hpack_decoder.cc
src/net/spdy/hpack/hpack_encoder.cc
src/net/spdy/hpack/hpack_entry.cc
src/net/spdy/hpack/hpack_header_table.cc
src/net/spdy/hpack/hpack_huffman_table.cc
src/net/spdy/hpack/hpack_input_stream.cc
src/net/spdy/hpack/hpack_output_stream.cc
src/net/spdy/hpack/hpack_static_table.cc
)

if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
Expand Down Expand Up @@ -279,13 +295,22 @@ set(
src/crypto/secure_util.cc
)

set(
URL_SOURCES

src/url/url_constants.cc
)

add_library(
quic
STATIC

${NET_SOURCES}
${BASE_SOURCES}
${CRYPTO_SOURCES}
${URL_SOURCES}

src/stubs.cc

src/third_party/modp_b64/modp_b64.cc
src/third_party/zlib/gzwrite.c
Expand Down
7 changes: 2 additions & 5 deletions DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"base/sequence_checker.h",
"base/files/file.h",
"net/ssl/ssl_info.h",
"url/url_canon.h",
"net/spdy/spdy_header_block.h"
]
},
Expand All @@ -56,7 +55,6 @@
"base/third_party/valgrind/memcheck.h",
"zconf.h",
"net/ssl/ssl_info.h",
"url/url_canon.h",
"net/spdy/spdy_header_block.h",
"base/cpu.h",
"net/base/host_port_pair.h"
Expand All @@ -73,7 +71,6 @@
"base/third_party/valgrind/memcheck.h",
"zconf.h",
"net/ssl/ssl_info.h",
"url/url_canon.h",
"net/spdy/spdy_header_block.h",
"base/cpu.h",
"net/base/host_port_pair.h"
Expand All @@ -90,7 +87,6 @@
"base/files/file.h",
"zconf.h",
"net/ssl/ssl_info.h",
"url/url_canon.h",
"net/spdy/spdy_header_block.h",
"modp_b64.h",
"modp_b64_data.h",
Expand Down Expand Up @@ -228,6 +224,7 @@
{"from": "custom/net_util.h", "to": "net/base/net_util.h"},
{"from": "custom/net_util.cc", "to": "net/base/net_util.cc"},
{"from": "custom/debugger.h", "to": "base/debug/debugger.h"},
{"from": "custom/debugger.cc", "to": "base/debug/debugger.cc"}
{"from": "custom/debugger.cc", "to": "base/debug/debugger.cc"},
{"from": "custom/stubs.cc", "to": "stubs.cc"}
]
}
8 changes: 8 additions & 0 deletions custom/net_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ bool IsLocal6Hostname(const std::string& host) {

} // namespace

#if 0
std::string CanonicalizeHost(const std::string& host,
url::CanonHostInfo* host_info) {
// Try to canonicalize the host.
Expand All @@ -111,6 +112,7 @@ std::string CanonicalizeHost(const std::string& host,

return canon_host;
}
#endif

#if 0
std::string GetDirectoryListingHeader(const base::string16& title) {
Expand Down Expand Up @@ -176,6 +178,7 @@ int SetNonBlocking(int fd) {
#endif
}

#if 0
bool ParseHostAndPort(std::string::const_iterator host_and_port_begin,
std::string::const_iterator host_and_port_end,
std::string* host,
Expand Down Expand Up @@ -246,7 +249,9 @@ bool ParseHostAndPort(const std::string& host_and_port,
return ParseHostAndPort(
host_and_port.begin(), host_and_port.end(), host, port);
}
#endif

#if 0
std::string GetHostAndPort(const GURL& url) {
// For IPv6 literals, GURL::host() already includes the brackets so it is
// safe to just append a colon.
Expand All @@ -261,6 +266,7 @@ std::string GetHostAndOptionalPort(const GURL& url) {
return base::StringPrintf("%s:%s", url.host().c_str(), url.port().c_str());
return url.host();
}
#endif

#if 0
bool IsHostnameNonUnique(const std::string& hostname) {
Expand Down Expand Up @@ -431,6 +437,7 @@ std::string GetHostOrSpecFromURL(const GURL& url) {
}
#endif

#if 0
GURL SimplifyUrlForRequest(const GURL& url) {
DCHECK(url.is_valid());
GURL::Replacements replacements;
Expand All @@ -439,6 +446,7 @@ GURL SimplifyUrlForRequest(const GURL& url) {
replacements.ClearRef();
return url.ReplaceComponents(replacements);
}
#endif

bool HaveOnlyLoopbackAddresses() {
#if defined(OS_ANDROID)
Expand Down
8 changes: 8 additions & 0 deletions custom/net_util.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ typedef std::vector<unsigned char> IPAddressNumber;
static const size_t kBluetoothAddressSize = 6;
#endif

#if 0
// Splits an input of the form <host>[":"<port>] into its consitituent parts.
// Saves the result into |*host| and |*port|. If the input did not have
// the optional port, sets |*port| to -1.
Expand All @@ -65,13 +66,16 @@ NET_EXPORT bool ParseHostAndPort(
const std::string& host_and_port,
std::string* host,
int* port);
#endif

#if 0
// Returns a host:port string for the given URL.
NET_EXPORT std::string GetHostAndPort(const GURL& url);

// Returns a host[:port] string for the given URL, where the port is omitted
// if it is the default for the URL's scheme.
NET_EXPORT_PRIVATE std::string GetHostAndOptionalPort(const GURL& url);
#endif

// Returns true if |hostname| contains a non-registerable or non-assignable
// domain name (eg: a gTLD that has not been assigned by IANA) or an IP address
Expand Down Expand Up @@ -120,10 +124,12 @@ NET_EXPORT_PRIVATE void GetIdentityFromURL(const GURL& url,
// Returns either the host from |url|, or, if the host is empty, the full spec.
NET_EXPORT std::string GetHostOrSpecFromURL(const GURL& url);

#if 0
// Canonicalizes |host| and returns it. Also fills |host_info| with
// IP address information. |host_info| must not be NULL.
NET_EXPORT std::string CanonicalizeHost(const std::string& host,
url::CanonHostInfo* host_info);
#endif

// Returns true if |host| is not an IP address and is compliant with a set of
// rules based on RFC 1738 and tweaked to be compatible with the real world.
Expand Down Expand Up @@ -164,10 +170,12 @@ NET_EXPORT std::string GetDirectoryListingEntry(const base::string16& name,
// Set socket to non-blocking mode
NET_EXPORT int SetNonBlocking(int fd);

#if 0
// Strip the portions of |url| that aren't core to the network request.
// - user name / password
// - reference section
NET_EXPORT_PRIVATE GURL SimplifyUrlForRequest(const GURL& url);
#endif

// Returns true if it can determine that only loopback addresses are configured.
// i.e. if only 127.0.0.1 and ::1 are routable.
Expand Down
Loading

0 comments on commit 1237e41

Please sign in to comment.