128 lines
3.7 KiB
Plaintext
128 lines
3.7 KiB
Plaintext
--- libgnomevfs/gnome-vfs-dns-sd.c.orig Mon Jan 10 10:52:39 2005
|
|
+++ libgnomevfs/gnome-vfs-dns-sd.c Mon Apr 4 22:37:37 2005
|
|
@@ -76,7 +76,7 @@ typedef struct {
|
|
} dns_message_header;
|
|
|
|
typedef struct {
|
|
- char name[NS_MAXDNAME];
|
|
+ char name[MAXDNAME];
|
|
guint16 type;
|
|
guint16 class;
|
|
guint32 ttl;
|
|
@@ -241,7 +241,7 @@ parse_header (char *reply, int reply_len
|
|
unsigned char *p,
|
|
dns_message_header *header)
|
|
{
|
|
- if (reply_len < NS_HFIXEDSZ)
|
|
+ if (reply_len < HFIXEDSZ)
|
|
return -1;
|
|
|
|
header->id = decode_16 (p); p += 2;
|
|
@@ -251,7 +251,7 @@ parse_header (char *reply, int reply_len
|
|
header->nscount = decode_16 (p); p += 2;
|
|
header->arcount = decode_16 (p); p += 2;
|
|
|
|
- return NS_HFIXEDSZ;
|
|
+ return HFIXEDSZ;
|
|
}
|
|
|
|
|
|
@@ -324,7 +324,7 @@ unicast_list_domains_sync (const char *d
|
|
unsigned char reply[DNS_REPLY_SIZE];
|
|
unsigned char *p;
|
|
char *searchdomain;
|
|
- char name[NS_MAXDNAME];
|
|
+ char name[MAXDNAME];
|
|
dns_message_header header;
|
|
dns_message_rr rr;
|
|
int res;
|
|
@@ -340,7 +340,7 @@ unicast_list_domains_sync (const char *d
|
|
/* Use TCP to support large queries */
|
|
_res.options |= RES_USEVC;
|
|
searchdomain = g_strconcat ("_browse._dns-sd._udp.", domain, NULL);
|
|
- reply_len = res_search (searchdomain, ns_c_in, ns_t_ptr,
|
|
+ reply_len = res_search (searchdomain, C_IN, T_PTR,
|
|
reply, sizeof (reply));
|
|
g_free (searchdomain);
|
|
if (reply_len == -1) {
|
|
@@ -384,7 +384,7 @@ unicast_list_domains_sync (const char *d
|
|
goto error;
|
|
p += len;
|
|
|
|
- if (rr.type == ns_t_ptr) {
|
|
+ if (rr.type == T_PTR) {
|
|
len = dn_expand (reply, reply + reply_len, p, name, sizeof(name));
|
|
if (len < 0)
|
|
goto error;
|
|
@@ -435,7 +435,7 @@ unicast_browse_sync (const char *domain,
|
|
unsigned char reply[DNS_REPLY_SIZE];
|
|
unsigned char *p;
|
|
char *searchdomain;
|
|
- char name[NS_MAXDNAME];
|
|
+ char name[MAXDNAME];
|
|
dns_message_header header;
|
|
dns_message_rr rr;
|
|
GArray *array;
|
|
@@ -452,7 +452,7 @@ unicast_browse_sync (const char *domain,
|
|
/* Use TCP to support large queries */
|
|
_res.options |= RES_USEVC;
|
|
searchdomain = g_strconcat (type, ".", domain, NULL);
|
|
- reply_len = res_search (searchdomain, ns_c_in, ns_t_ptr,
|
|
+ reply_len = res_search (searchdomain, C_IN, T_PTR,
|
|
reply, sizeof (reply));
|
|
g_free (searchdomain);
|
|
if (reply_len == -1) {
|
|
@@ -498,11 +498,12 @@ unicast_browse_sync (const char *domain,
|
|
goto error;
|
|
p += len;
|
|
|
|
- if (rr.type == ns_t_ptr) {
|
|
+ if (rr.type == T_PTR) {
|
|
GnomeVFSDNSSDService service;
|
|
- char ptr_service[NS_MAXDNAME];
|
|
- char ptr_type[NS_MAXDNAME];
|
|
- char ptr_domain[NS_MAXDNAME];
|
|
+
|
|
+ char ptr_service[MAXDNAME];
|
|
+ char ptr_type[MAXDNAME];
|
|
+ char ptr_domain[MAXDNAME];
|
|
|
|
len = dn_expand (reply, reply + reply_len, p, name, sizeof(name));
|
|
if (len < 0)
|
|
@@ -596,7 +597,7 @@ unicast_resolve_sync (const char *name,
|
|
int reply_len, len, i;
|
|
unsigned char reply[DNS_REPLY_SIZE];
|
|
unsigned char *p;
|
|
- char dnsname[NS_MAXDNAME];
|
|
+ char dnsname[MAXDNAME];
|
|
dns_message_header header;
|
|
dns_message_rr rr;
|
|
char *full_name;
|
|
@@ -616,7 +617,7 @@ unicast_resolve_sync (const char *name,
|
|
_res.options |= RES_USEVC;
|
|
|
|
full_name = service_to_dns_name (name, type, domain);
|
|
- reply_len = res_search (full_name, ns_c_in, ns_t_any,
|
|
+ reply_len = res_search (full_name, C_IN, T_ANY,
|
|
reply, sizeof (reply));
|
|
g_free (full_name);
|
|
if (reply_len == -1) {
|
|
@@ -660,7 +661,7 @@ unicast_resolve_sync (const char *name,
|
|
goto error;
|
|
p += len;
|
|
|
|
- if (rr.type == ns_t_srv) {
|
|
+ if (rr.type == T_SRV) {
|
|
unsigned char *pp;
|
|
int priority, weight, port;
|
|
|
|
@@ -681,7 +682,7 @@ unicast_resolve_sync (const char *name,
|
|
}
|
|
}
|
|
|
|
- if (rr.type == ns_t_txt) {
|
|
+ if (rr.type == T_TXT) {
|
|
*text_raw_out = g_memdup (p, rr.rdlength);
|
|
*text_raw_len_out = rr.rdlength;
|
|
}
|