diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-06-22 14:35:31 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-06-22 14:35:31 -0400 |
| commit | f91d40c25949ee8c5b1d5c1babab62d6dd90d0c8 (patch) | |
| tree | f6edb92af2353a63bba05804cd89166487045559 /indra/llmessage/net.h | |
| parent | d5ea63119d1cc848318dbeeaa42e9ce3b777ee51 (diff) | |
Merge, fixed build issues by refactoring SOCKS 5 code.
Diffstat (limited to 'indra/llmessage/net.h')
| -rw-r--r-- | indra/llmessage/net.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/llmessage/net.h b/indra/llmessage/net.h index 0d91cf2a2f..0f2437479d 100644 --- a/indra/llmessage/net.h +++ b/indra/llmessage/net.h @@ -27,9 +27,6 @@ #ifndef LL_NET_H #define LL_NET_H -#include "lliosocket.h" -#include "llapr.h" - class LLTimer; class LLHost; @@ -55,11 +52,6 @@ U32 get_sender_ip(void); LLHost get_receiving_interface(); U32 get_receiving_interface_ip(void); -// Some helpful TCP functions -LLSocket::ptr_t tcp_open_channel(LLHost host); // Open a TCP channel to a given host -void tcp_close_channel(LLSocket::ptr_t handle); // Close an open TCP channel -int tcp_handshake(LLSocket::ptr_t handle, char * dataout, apr_size_t outlen, char * datain, apr_size_t maxinlen); // Do a TCP data handshake - const char* u32_to_ip_string(U32 ip); // Returns pointer to internal string buffer, "(bad IP addr)" on failure, cannot nest calls char* u32_to_ip_string(U32 ip, char *ip_string); // NULL on failure, ip_string on success, you must allocate at least MAXADDRSTR chars U32 ip_string_to_u32(const char* ip_string); // Wrapper for inet_addr() |