Changeset 2094 for Whitix/branches

Timestamp:

05/27/10 12:20:46 (21 months ago)

Author:

mwhitworth

Message:

Fix UDP warnings.

Files:

• Whitix/branches/netchannel/user/sdk/network/dns.c (modified) (7 diffs)

Whitix/branches/netchannel/user/sdk/network/dns.c

@@ -6 +6 @@
 #include <types.h>
 #include <string.h>
+#include <stdio.h>
+
+#include "udp.h"
 
 /* Protocol structures. */
@@ -48 +51 @@
 }
 
-int DnsPutName(char* buf, char* name)
+int DnsPutName(char* buf, const char* name)
 {
         int total = 0;
@@ -74 +77 @@
 }
 
-void DnsAddQuery(struct DnsState* state, char* name, int type)
+void DnsAddQuery(struct DnsState* state, const char* name, int type)
 {
         struct DnsQuestionEnd* end;
@@ -179 +182 @@
 }
 
+int DnsSkipRecord(struct DnsState* state, struct DnsAnswer* answer)
+{
+        return sizeof(struct DnsAnswer) + NetToHostShort(answer->length);
+}
+
 int DnsGetCanonicalName(struct DnsState* state, char* name, int length, int
                 start)
@@ -204 +212 @@
 }
 
-int DnsSkipRecord(struct DnsState* state, struct DnsAnswer* answer)
-{
-        ushort type = NetToHostShort(answer->type);
-                
-        return sizeof(struct DnsAnswer) + NetToHostShort(answer->length);
-}
-
 int DnsGetIpAddresses(struct DnsState* state, ulong* address, int
                 start)
 {
-        int i, length;
-        char* p;
+        int i;
         struct DnsAnswer* answer = (struct DnsAnswer*)(state->buf+state->offset);
 
@@ -226 +226 @@
         for (i = start; i < state->answers; i++)
         {
+                ushort class = NetToHostShort(answer->class);
                 ushort type = NetToHostShort(answer->type);
-                ushort class = NetToHostShort(answer->class);
-                ushort len = NetToHostShort(answer->length);
         
                 if (class != DNS_CLASS_IN)
@@ -282 +281 @@
         length = DnsFinishHeader(&state);
                 
-        if (SocketSendTo(dnsSocket, buf, length, 0, &dnsAddr) < length)
+        if (SocketSendTo(dnsSocket, buf, length, 0, (struct SockAddr*)&dnsAddr) < length)
                 return 1;
                 
         length = 1024;
 
-        if ((length = SocketRecvFrom(dnsSocket, buf, length, dnsAddr)) <= 0)
+        if ((length = SocketRecvFrom(dnsSocket, buf, length, 0, (struct SockAddr*)&dnsAddr)) <= 0)
                 return 1;