summaryrefslogtreecommitdiff
path: root/src/net_query.h
diff options
context:
space:
mode:
authorSimon Howard2010-12-10 22:44:01 +0000
committerSimon Howard2010-12-10 22:44:01 +0000
commit8dab0a3e635db40359c8ddeb9afaa9eca626ee98 (patch)
treecfd01bd0c96a97fcffad588782a5d106ca1b3d2f /src/net_query.h
parent005747a6174d2d5b72e1af196a72cafb9b801a58 (diff)
parent678a8f9aeea9fa1966b3e8a94974688fda4d8fe1 (diff)
downloadchocolate-doom-8dab0a3e635db40359c8ddeb9afaa9eca626ee98.tar.gz
chocolate-doom-8dab0a3e635db40359c8ddeb9afaa9eca626ee98.tar.bz2
chocolate-doom-8dab0a3e635db40359c8ddeb9afaa9eca626ee98.zip
Merge from trunk. This is slightly out of date as I did the merge
several days ago. Subversion-branch: /branches/raven-branch Subversion-revision: 2212
Diffstat (limited to 'src/net_query.h')
-rw-r--r--src/net_query.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/net_query.h b/src/net_query.h
index f682d320..01e059cb 100644
--- a/src/net_query.h
+++ b/src/net_query.h
@@ -27,9 +27,22 @@
#include "net_defs.h"
+typedef void (*net_query_callback_t)(net_addr_t *addr,
+ net_querydata_t *querydata,
+ unsigned int ping_time,
+ void *user_data);
+
+extern int NET_LANQuery(net_query_callback_t callback, void *user_data);
+extern int NET_MasterQuery(net_query_callback_t callback, void *user_data);
extern void NET_QueryAddress(char *addr);
-extern void NET_LANQuery(void);
extern net_addr_t *NET_FindLANServer(void);
+extern void NET_QueryPrintCallback(net_addr_t *addr, net_querydata_t *data,
+ unsigned int ping_time, void *user_data);
+
+extern net_addr_t *NET_Query_ResolveMaster(net_context_t *context);
+extern void NET_Query_AddToMaster(net_addr_t *master_addr);
+extern void NET_Query_MasterResponse(net_packet_t *packet);
+
#endif /* #ifndef NET_QUERY_H */