oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

v6-ify

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6754 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-08-05 12:21:00 +00:00
parent 51943ce882
commit cff9accccb
2 changed files with 71 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
appl/popper/pop_debug.c
View File

@@ -69,25 +69,46 @@ loop(int s)
}
static int
get_socket (char *host, int port)
get_socket (const char *hostname, int port)
{
struct sockaddr_in sa;
struct hostent *hp;
int s;
struct hostent *hostent = NULL;
char **h;
int error;
int af;
hp = roken_gethostbyname(host);
if(hp == NULL)
err(1, "%s", host);
s = socket(AF_INET, SOCK_STREAM, 0);
if (s < 0)
err(1, "socket");
memset(&sa, 0, sizeof(sa));
sa.sin_family = AF_INET;
sa.sin_port = port;
memcpy(&sa.sin_addr, hp->h_addr, sizeof(sa.sin_addr));
if(connect(s, (struct sockaddr*)&sa, sizeof(sa)) < 0)
err(1, "connect");
return s;
#ifdef HAVE_IPV6
if (hostent == NULL)
hostent = getipnodebyname (hostname, AF_INET6, 0, &error);
#endif
if (hostent == NULL)
hostent = getipnodebyname (hostname, AF_INET, 0, &error);
if (hostent == NULL)
errx(1, "gethostbyname '%s' failed: %s", hostname, hstrerror(error));
af = hostent->h_addrtype;
for (h = hostent->h_addr_list; *h != NULL; ++h) {
struct sockaddr_storage sa_ss;
struct sockaddr *sa = (struct sockaddr *)&sa_ss;
int s;
sa->sa_family = af;
socket_set_address_and_port (sa, *h, port);
s = socket (af, SOCK_STREAM, 0);
if (s < 0)
err (1, "socket");
if (connect (s, sa, socket_sockaddr_size(sa)) < 0) {
warn ("connect(%s)", hostname);
close (s);
continue;
}
freehostent (hostent);
return s;
}
freehostent (hostent);
exit (1);
}
#ifdef KRB4

55
appl/popper/pop_init.c
View File

@@ -23,7 +23,7 @@ pop_net_read(POP *p, int fd, void *buf, size_t len)
#ifdef KRB4
static int
krb4_authenticate (POP *p, int s, u_char *buf, struct sockaddr_in *addr)
krb4_authenticate (POP *p, int s, u_char *buf, struct sockaddr *addr)
{
Key_schedule schedule;
KTEXT_ST ticket;
@@ -45,7 +45,7 @@ krb4_authenticate (POP *p, int s, u_char *buf, struct sockaddr_in *addr)
&ticket,
"pop",
instance,
addr,
(struct sockaddr_in *)addr,
(struct sockaddr_in *) NULL,
&p->kdata,
"",
@@ -63,7 +63,7 @@ krb4_authenticate (POP *p, int s, u_char *buf, struct sockaddr_in *addr)
#ifdef DEBUG
pop_log(p, POP_DEBUG, "%s.%s@%s (%s): ok", p->kdata.pname,
p->kdata.pinst, p->kdata.prealm, inet_ntoa(addr->sin_addr));
p->kdata.pinst, p->kdata.prealm, p->ipaddr);
#endif /* DEBUG */
return 0;
}
@@ -71,7 +71,7 @@ krb4_authenticate (POP *p, int s, u_char *buf, struct sockaddr_in *addr)
#ifdef KRB5
static int
krb5_authenticate (POP *p, int s, u_char *buf, struct sockaddr_in *addr)
krb5_authenticate (POP *p, int s, u_char *buf, struct sockaddr *addr)
{
krb5_error_code ret;
krb5_auth_context auth_context = NULL;
@@ -121,7 +121,7 @@ krb5_authenticate (POP *p, int s, u_char *buf, struct sockaddr_in *addr)
#endif
static int
krb_authenticate(POP *p, struct sockaddr_in *addr)
krb_authenticate(POP *p, struct sockaddr *addr)
{
#if defined(KRB4) || defined(KRB5)
u_char buf[BUFSIZ];
@@ -151,7 +151,7 @@ krb_authenticate(POP *p, struct sockaddr_in *addr)
}
static int
plain_authenticate (POP *p, struct sockaddr_in *addr)
plain_authenticate (POP *p, struct sockaddr *addr)
{
return(POP_SUCCESS);
}
@@ -202,13 +202,14 @@ pop_getportbyname(POP *p, const char *service,
int
pop_init(POP *p,int argcount,char **argmessage)
{
struct sockaddr_in cs; /* Communication parameters */
struct sockaddr_storage cs_ss;
struct sockaddr *cs = (struct sockaddr *)&cs_ss;
struct hostent * ch; /* Client host information */
int len;
char * trace_file_name = "/tmp/popper-trace";
int portnum = 0;
int optind = 0;
int error;
/* Initialize the POP parameter block */
memset (p, 0, sizeof(POP));
@@ -295,8 +296,8 @@ pop_init(POP *p,int argcount,char **argmessage)
}
/* Get the address and socket of the client to whom I am speaking */
len = sizeof(cs);
if (getpeername(STDIN_FILENO, (struct sockaddr *)&cs, &len) < 0){
len = sizeof(cs_ss);
if (getpeername(STDIN_FILENO, cs, &len) < 0) {
pop_log(p,POP_PRIORITY,
"Unable to obtain socket and address of client, err = %d",errno);
exit (1);
@@ -304,18 +305,20 @@ pop_init(POP *p,int argcount,char **argmessage)
/* Save the dotted decimal form of the client's IP address
in the POP parameter block */
strcpy_truncate (p->ipaddr, inet_ntoa(cs.sin_addr), sizeof(p->ipaddr));
inet_ntop (cs->sa_family, socket_get_address (cs),
p->ipaddr, sizeof(p->ipaddr));
/* Save the client's port */
p->ipport = ntohs(cs.sin_port);
p->ipport = ntohs(socket_get_port (cs));
/* Get the canonical name of the host to whom I am speaking */
ch = roken_gethostbyaddr((const char *)&cs.sin_addr,
sizeof(cs.sin_addr),
AF_INET);
ch = getipnodebyaddr (socket_get_address (cs),
socket_addr_size (cs),
cs->sa_family,
&error);
if (ch == NULL){
pop_log(p,POP_PRIORITY,
"Unable to get canonical name of client, err = %d",errno);
"Unable to get canonical name of client, err = %d",error);
strcpy_truncate (p->client, p->ipaddr, sizeof(p->client));
}
/* Save the cannonical name of the client host in
@@ -327,7 +330,12 @@ pop_init(POP *p,int argcount,char **argmessage)
/* See if the name obtained for the client's IP
address returns an address */
if ((ch_again = roken_gethostbyname(ch->h_name)) == NULL) {
ch_again = getipnodebyname (ch->h_name,
cs->sa_family,
0,
&error);
if (ch_again == NULL) {
pop_log(p,POP_PRIORITY,
"Client at \"%s\" resolves to an unknown host name \"%s\"",
p->ipaddr,ch->h_name);
@@ -336,14 +344,15 @@ pop_init(POP *p,int argcount,char **argmessage)
else {
/* Save the host name (the previous value was
destroyed by gethostbyname) */
strcpy_truncate (p->client, ch_again->h_name, sizeof(p->client));
strcpy_truncate (p->client, ch->h_name, sizeof(p->client));
/* Look for the client's IP address in the list returned
for its name */
for (addrp=ch_again->h_addr_list; *addrp; ++addrp)
if (memcmp(*addrp, &cs.sin_addr, sizeof(cs.sin_addr))
== 0)
break;
if (memcmp(*addrp,
socket_get_address (cs),
socket_addr_size (cs)) == 0)
break;
if (!*addrp) {
pop_log (p,POP_PRIORITY,
@@ -352,7 +361,9 @@ pop_init(POP *p,int argcount,char **argmessage)
strcpy_truncate (p->client, p->ipaddr, sizeof(p->client));
}
}
freehostent (ch_again);
}
freehostent (ch);
/* Create input file stream for TCP/IP communication */
if ((p->input = fdopen(STDIN_FILENO,"r")) == NULL){
@@ -382,5 +393,5 @@ pop_init(POP *p,int argcount,char **argmessage)
#endif /* DEBUG */
return((p->kerberosp ? krb_authenticate : plain_authenticate)(p, &cs));
return((p->kerberosp ? krb_authenticate : plain_authenticate)(p, cs));
}