d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

name union.

Browse Source
This commit is contained in:
Hajimu UMEMOTO 2003-06-28 15:37:04 +00:00
parent 5d3b4c2480
commit 2cc2a59d85
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=116990
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr.sbin/ppp/radius.c
View File

@ -984,8 +984,8 @@ radius_Account_Set_Ip(struct radacct *ac, struct in_addr *peer_ip,
struct in_addr *netmask)
{
ac->proto = PROTO_IPCP;
memcpy(&ac->ip.addr, peer_ip, sizeof(ac->ip.addr));
memcpy(&ac->ip.mask, netmask, sizeof(ac->ip.mask));
memcpy(&ac->peer.ip.addr, peer_ip, sizeof(ac->peer.ip.addr));
memcpy(&ac->peer.ip.mask, netmask, sizeof(ac->peer.ip.mask));
}
#ifndef NOINET6
@ -994,7 +994,7 @@ void
radius_Account_Set_Ipv6(struct radacct *ac, u_char *ifid)
{
ac->proto = PROTO_IPV6CP;
memcpy(&ac->ipv6.ifid, ifid, sizeof(ac->ipv6.ifid));
memcpy(&ac->peer.ipv6.ifid, ifid, sizeof(ac->peer.ipv6.ifid));
}
#endif
@ -1071,8 +1071,10 @@ radius_Account(struct radius *r, struct radacct *ac, struct datalink *dl,
}
switch (ac->proto) {
case PROTO_IPCP:
if (rad_put_addr(r->cx.rad, RAD_FRAMED_IP_ADDRESS, ac->ip.addr) != 0 ||
rad_put_addr(r->cx.rad, RAD_FRAMED_IP_NETMASK, ac->ip.mask) != 0) {
if (rad_put_addr(r->cx.rad, RAD_FRAMED_IP_ADDRESS,
ac->peer.ip.addr) != 0 || \
rad_put_addr(r->cx.rad, RAD_FRAMED_IP_NETMASK,
ac->peer.ip.mask) != 0) {
log_Printf(LogERROR, "rad_put: %s\n", rad_strerror(r->cx.rad));
rad_close(r->cx.rad);
return;
@ -1080,8 +1082,8 @@ radius_Account(struct radius *r, struct radacct *ac, struct datalink *dl,
break;
#ifndef NOINET6
case PROTO_IPV6CP:
if (rad_put_attr(r->cx.rad, RAD_FRAMED_INTERFACE_ID, ac->ipv6.ifid,
sizeof(ac->ipv6.ifid)) != 0) {
if (rad_put_attr(r->cx.rad, RAD_FRAMED_INTERFACE_ID, ac->peer.ipv6.ifid,
sizeof(ac->peer.ipv6.ifid)) != 0) {
log_Printf(LogERROR, "rad_put_attr: %s\n", rad_strerror(r->cx.rad));
rad_close(r->cx.rad);
return;

2
usr.sbin/ppp/radius.h
View File

@ -85,7 +85,7 @@ struct radacct {
u_char ifid[8];
} ipv6;
#endif
};
} peer;
};
#define descriptor2radius(d) \