diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-25 09:27:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-25 09:27:34 -0400 |
| commit | e6239b7978fb9f05d2c8c7cf42b9277f4a5f7c52 (patch) | |
| tree | 17080b4ffa8a59a5b9c158edaf9e60f9af2a67b4 /indra/llmessage/net.h | |
| parent | 66cac05cfb1236c3c1607dff27babf873c29a679 (diff) | |
| parent | 6484dbf28cb8b6ffa745fe9b26beae58d3c68441 (diff) | |
merge changes for storm-1571
Diffstat (limited to 'indra/llmessage/net.h')
| -rw-r--r-- | indra/llmessage/net.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/net.h b/indra/llmessage/net.h index 9f4f5c5821..0f2437479d 100644 --- a/indra/llmessage/net.h +++ b/indra/llmessage/net.h @@ -46,10 +46,10 @@ S32 receive_packet(int hSocket, char * receiveBuffer); BOOL send_packet(int hSocket, const char *sendBuffer, int size, U32 recipient, int nPort); // Returns TRUE on success. //void get_sender(char * tmp); -LLHost get_sender(); +LLHost get_sender(); U32 get_sender_port(); U32 get_sender_ip(void); -LLHost get_receiving_interface(); +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 |