diff options
| author | Robert Knop <prospero@lindenlab.com> | 2009-01-19 22:05:19 +0000 |
|---|---|---|
| committer | Robert Knop <prospero@lindenlab.com> | 2009-01-19 22:05:19 +0000 |
| commit | ce888706c5589bbd30423cd1cbfb7b168b16d680 (patch) | |
| tree | 9869898ee1d915bfc6faec72a5c9f5198702f2df /indra/llmessage/net.h | |
| parent | f1380f2fc3eecd8dfd2f75d053ff86716d5055f7 (diff) | |
svn merge -r108236:108243 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Still merging from server-1.25... one day I will catch up!
No conflicts
Diffstat (limited to 'indra/llmessage/net.h')
| -rw-r--r-- | indra/llmessage/net.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llmessage/net.h b/indra/llmessage/net.h index 9a97b34100..45b07a0ab8 100644 --- a/indra/llmessage/net.h +++ b/indra/llmessage/net.h @@ -55,6 +55,8 @@ BOOL send_packet(int hSocket, const char *sendBuffer, int size, U32 recipient, i LLHost get_sender(); U32 get_sender_port(); U32 get_sender_ip(void); +LLHost get_receiving_interface(); +U32 get_receiving_interface_ip(void); 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 |