typedef struct Socket_tag *Actual_Socket;
struct SockAddr_tag {
+ int resolved;
OSStatus error;
- DNSAddress address;
+ InetHostInfo hostinfo;
+ char hostname[512];
};
/* Globals */
static struct {
Actual_Socket socklist;
+ InetSvcRef inetsvc;
} ot;
OSErr ot_init(void)
{
- return InitOpenTransport();
+ OSStatus err;
+
+ err = InitOpenTransport();
+ if (err != kOTNoError) return err;
+ ot.inetsvc = OTOpenInternetServices(kDefaultInternetServicesPath, 0, &err);
+ return err;
}
void ot_cleanup(void)
CloseOpenTransport();
}
-SockAddr ot_namelookup(char *host, char **canonicalname)
+SockAddr ot_namelookup(char const *host, char **canonicalname)
{
SockAddr ret = smalloc(sizeof(struct SockAddr_tag));
-
- ret->error = kOTNoError;
- OTInitDNSAddress(&(ret->address), host);
-
- /* for now we'll pretend canonicalname is always just host */
-
- *canonicalname = smalloc(1+strlen(host));
- strcpy(*canonicalname, host);
+ char *realhost;
+
+ /* Casting away const -- hope OTInetStringToAddress is sensible */
+ ret->error = OTInetStringToAddress(ot.inetsvc, (char *)host,
+ &ret->hostinfo);
+ ret->resolved = TRUE;
+
+ if (ret->error == kOTNoError)
+ realhost = ret->hostinfo.name;
+ else
+ realhost = "";
+ *canonicalname = smalloc(1+strlen(realhost));
+ strcpy(*canonicalname, realhost);
return ret;
}
-SockAddr ot_nonamelookup(char *host)
+SockAddr ot_nonamelookup(char const *host)
{
SockAddr ret = smalloc(sizeof(struct SockAddr_tag));
- OTInitDNSAddress(&(ret->address), host);
-
+ ret->resolved = FALSE;
+ ret->error = kOTNoError;
+ ret->hostname[0] = '\0';
+ strncat(ret->hostname, host, lenof(ret->hostname) - 1);
return ret;
}
void ot_getaddr(SockAddr addr, char *buf, int buflen)
{
- strncpy(buf, (addr->address).fName, buflen);
+ char mybuf[16];
+
+ buf[0] = '\0';
+ if (addr->resolved) {
+ /* XXX only return first address */
+ OTInetHostToString(addr->hostinfo.addrs[0], mybuf);
+ strncat(buf, mybuf, buflen - 1);
+ } else
+ strncat(buf, addr->hostname, buflen - 1);
}
/* I think "local" here really means "loopback" */
int ot_address_is_local(SockAddr addr)
{
+ int i;
- /* FIXME */
+ if (addr->resolved)
+ for (i = 0; i < kMaxHostAddrs; i++)
+ if (addr->hostinfo.addrs[i] & 0xff000000 == 0x7f000000)
+ return TRUE;
return FALSE;
}
int ot_addrtype(SockAddr addr)
{
- return ADDRTYPE_IPV4;
+
+ if (addr->resolved)
+ return ADDRTYPE_IPV4;
+ return ADDRTYPE_NAME;
}
void ot_addrcopy(SockAddr addr, char *buf)
{
-
+
+ /* XXX only return first address */
+ memcpy(buf, &addr->hostinfo.addrs[0], 4);
}
void ot_addr_free(SockAddr addr)
Actual_Socket ret;
EndpointRef ep;
OSStatus err;
+ InetAddress dest;
TCall connectCall;
ret = smalloc(sizeof(struct Socket_tag));
* Connect to remote address.
*/
- /* FIXME: bolt the port onto the end */
+ /* XXX Try non-primary addresses */
+ OTInitInetAddress(&dest, port, addr->hostinfo.addrs[0]);
memset(&connectCall, 0, sizeof(TCall));
- connectCall.addr.buf = (UInt8 *) &(addr->address);
- connectCall.addr.len = sizeof(DNSAddress);
+ connectCall.addr.buf = (UInt8 *) &dest;
+ connectCall.addr.len = sizeof(dest);
err = OTConnect(ep, &connectCall, nil);
/* Add this to the list of all sockets */
ret->next = ot.socklist;
ret->prev = &ot.socklist;
+ if (ret->next != NULL)
+ ret->next->prev = &ret->next;
ot.socklist = ret;
return (Socket) ret;
if (s->frozen) return;
- while ((o = OTRcv(s->ep, buf, sizeof(buf), &flags)) != kOTNoDataErr) {
- plug_receive(s->plug, 0, buf, sizeof(buf));
- }
+ do {
+ o = OTRcv(s->ep, buf, sizeof(buf), &flags);
+ if (o > 0)
+ plug_receive(s->plug, 0, buf, o);
+ if (o < 0 && o != kOTNoDataErr)
+ plug_closing(s->plug, NULL, 0, 0); /* XXX Error msg */
+ } while (o > 0);
}