Skip to content

L
linux
Commit 4a493922 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Kill in_ntoa from the tree.

parent 12680ec4
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 107 deletions
drivers/net/wan/sdla_chdlc.c
View file @ 4a493922
......@@ -2680,18 +2680,20 @@ static void process_route (sdla_t *card)
printk(KERN_INFO "%s: Dynamic route failure.\n",card->devname);
if(card->u.c.slarp_timer) {
u32 addr_net = htonl(chdlc_priv_area->IP_address);
printk(KERN_INFO "%s: Bad IP address %s received\n",
printk(KERN_INFO "%s: Bad IP address %u.%u.%u.%u received\n",
card->devname,
in_ntoa(ntohl(chdlc_priv_area->IP_address)));
NIPQUAD(addr_net));
printk(KERN_INFO "%s: from remote station.\n",
card->devname);
}else{
u32 addr_net = htonl(chdlc_priv_area->IP_address);
printk(KERN_INFO "%s: Bad IP address %s issued\n",
card->devname,
in_ntoa(ntohl(chdlc_priv_area->IP_address)));
printk(KERN_INFO "%s: Bad IP address %u.%u.%u.%u issued\n",
card->devname,
NIPQUAD(addr_net));
printk(KERN_INFO "%s: to remote station. Local\n",
card->devname);
printk(KERN_INFO "%s: IP address must be A.B.C.1\n",
......@@ -2810,16 +2812,16 @@ static void process_route (sdla_t *card)
}
if(err) {
printk(KERN_INFO "%s: Add route %s failed (%d)\n",
card->devname, in_ntoa(remote_IP_addr), err);
printk(KERN_INFO "%s: Add route %u.%u.%u.%u failed (%d)\n",
card->devname, NIPQUAD(remote_IP_addr), err);
} else {
((chdlc_private_area_t *)dev->priv)->route_status = ROUTE_ADDED;
printk(KERN_INFO "%s: Dynamic route added.\n",
card->devname);
printk(KERN_INFO "%s: Local IP addr : %s\n",
card->devname, in_ntoa(local_IP_addr));
printk(KERN_INFO "%s: Remote IP addr: %s\n",
card->devname, in_ntoa(remote_IP_addr));
printk(KERN_INFO "%s: Local IP addr : %u.%u.%u.%u\n",
card->devname, NIPQUAD(local_IP_addr));
printk(KERN_INFO "%s: Remote IP addr: %u.%u.%u.%u\n",
card->devname, NIPQUAD(remote_IP_addr));
chdlc_priv_area->route_removed = 0;
}
break;
......@@ -2851,13 +2853,13 @@ static void process_route (sdla_t *card)
if(err) {
printk(KERN_INFO
"%s: Remove route %s failed, (err %d)\n",
card->devname, in_ntoa(remote_IP_addr),
card->devname, NIPQUAD(remote_IP_addr),
err);
} else {
((chdlc_private_area_t *)dev->priv)->route_status =
NO_ROUTE;
printk(KERN_INFO "%s: Dynamic route removed: %s\n",
card->devname, in_ntoa(local_IP_addr));
printk(KERN_INFO "%s: Dynamic route removed: %u.%u.%u.%u\n",
card->devname, NIPQUAD(local_IP_addr));
chdlc_priv_area->route_removed = 1;
}
break;
......
drivers/net/wan/sdla_fr.c
View file @ 4a493922
......@@ -152,7 +152,6 @@
#include <asm/io.h> /* for inb(), outb(), etc. */
#include <linux/time.h> /* for do_gettimeofday */
#include <linux/in.h> /* sockaddr_in */
#include <linux/inet.h> /* in_ntoa(), etc... */
#include <asm/errno.h>
#include <linux/ip.h>
......@@ -2809,16 +2808,15 @@ static void process_route (netdevice_t *dev)
set_fs(fs); /* restore old block */
if (err) {
printk(KERN_INFO
"%s: Route Add failed. Error: %d\n",
card->devname,err);
printk(KERN_INFO "%s: Address: %s\n",
chan->name, in_ntoa(chan->ip_remote));
printk(KERN_INFO "%s: Address: %u.%u.%u.%u\n",
chan->name, NIPQUAD(chan->ip_remote));
}else {
printk(KERN_INFO "%s: Route Added Successfully: %s\n",
card->devname,in_ntoa(chan->ip_remote));
printk(KERN_INFO "%s: Route Added Successfully: %u.%u.%u.%U\n",
card->devname,NIPQUAD(chan->ip_remote));
chan->route_flag = ROUTE_ADDED;
}
break;
......@@ -2841,17 +2839,15 @@ static void process_route (netdevice_t *dev)
set_fs(fs);
if (err) {
printk(KERN_INFO
"%s: Deleting of route failed. Error: %d\n",
card->devname,err);
printk(KERN_INFO "%s: Address: %s\n",
dev->name,in_ntoa(chan->ip_remote) );
printk(KERN_INFO "%s: Address: %u.%u.%u.%u\n",
dev->name,NIPQUAD(chan->ip_remote) );
} else {
printk(KERN_INFO "%s: Route Removed Sucessfuly: %s\n",
card->devname,in_ntoa(ip_tmp));
printk(KERN_INFO "%s: Route Removed Sucessfuly: %u.%u.%u.%u\n",
card->devname,NIPQUAD(ip_tmp));
chan->route_flag = NO_ROUTE;
}
break;
......@@ -2887,8 +2883,8 @@ static void process_route (netdevice_t *dev)
if (err) {
printk(KERN_INFO "%s: Adding of route failed. Error: %d\n",
card->devname,err);
printk(KERN_INFO "%s: Address: %s\n",
chan->name, in_ntoa(dev->pa_dstaddr) );
printk(KERN_INFO "%s: Address: %u.%u.%u.%u\n",
chan->name, NIPQUAD(dev->pa_dstaddr) );
}
else {
chan->route_flag = ROUTE_ADDED;
......@@ -2902,11 +2898,10 @@ static void process_route (netdevice_t *dev)
set_fs(fs); /* restore old block */
if (err) {
printk(KERN_INFO "%s: Deleting of route failed. Error: %d\n",
card->devname,err);
printk(KERN_INFO "%s: Address: %s\n",
dev->name,in_ntoa(dev->pa_dstaddr) );
printk(KERN_INFO "%s: Address: %u.%u.%u.%u\n",
dev->name,NIPQUAD(dev->pa_dstaddr) );
} else {
printk(KERN_INFO "%s: Removed route.\n",
......@@ -4337,8 +4332,8 @@ int process_ARP(arphdr_1490_t *ArpPacket, sdla_t *card, netdevice_t* dev)
case 0x08: // Inverse ARP request -- Send Reply, add route.
/* Check for valid Address */
printk(KERN_INFO "%s: Recvd PtP addr -InArp Req: %s\n",
card->devname, in_ntoa(arphdr->ar_sip));
printk(KERN_INFO "%s: Recvd PtP addr -InArp Req: %u.%u.%u.%u\n",
card->devname, NIPQUAD(arphdr->ar_sip));
/* Check that the network address is the same as ours, only
......@@ -4348,15 +4343,14 @@ int process_ARP(arphdr_1490_t *ArpPacket, sdla_t *card, netdevice_t* dev)
if (in_dev->ifa_list->ifa_mask != 0xFFFFFFFF &&
(in_dev->ifa_list->ifa_mask & arphdr->ar_sip) !=
(in_dev->ifa_list->ifa_mask & in_dev->ifa_list->ifa_local)){
printk(KERN_INFO
"%s: Invalid PtP address. %s InARP ignored.\n",
card->devname,in_ntoa(arphdr->ar_sip));
"%s: Invalid PtP address. %u.%u.%u.%u InARP ignored.\n",
card->devname,NIPQUAD(arphdr->ar_sip));
printk(KERN_INFO "%s: mask %s\n",
card->devname, in_ntoa(in_dev->ifa_list->ifa_mask));
printk(KERN_INFO "%s: local %s\n",
card->devname,in_ntoa(in_dev->ifa_list->ifa_local));
printk(KERN_INFO "%s: mask %u.%u.%u.%u\n",
card->devname, NIPQUAD(in_dev->ida_list->ifa_mask));
printk(KERN_INFO "%s: local %u.%u.%u.%u\n",
card->devname,NIPQUAD(in_dev->ida_list->ifa_local));
return -1;
}
......@@ -4401,8 +4395,8 @@ int process_ARP(arphdr_1490_t *ArpPacket, sdla_t *card, netdevice_t* dev)
case 0x09: // Inverse ARP reply
/* Check for valid Address */
printk(KERN_INFO "%s: Recvd PtP addr %s -InArp Reply\n",
card->devname, in_ntoa(arphdr->ar_sip));
printk(KERN_INFO "%s: Recvd PtP addr %u.%u.%u.%u -InArp Reply\n",
card->devname, NIPQUAD(arphdr->ar_sip));
/* Compare network addresses, only if network mask
......@@ -4450,8 +4444,8 @@ int process_ARP(arphdr_1490_t *ArpPacket, sdla_t *card, netdevice_t* dev)
case 0x08: // Inverse ARP request -- Send Reply, add route.
/* Check for valid Address */
printk(KERN_INFO "%s: Recvd PtP addr %s -InArp Req\n",
((fr_channel_t *)dev->priv)->name, in_ntoa(arphdr->ar_sip));
printk(KERN_INFO "%s: Recvd PtP addr %u.%u.%u.%u -InArp Req\n",
((fr_channel_t *)dev->priv)->name, NIPQUAD(arphdr->ar_sip));
if (dev->pa_mask != 0xFFFFFFFF){
......@@ -4492,8 +4486,8 @@ int process_ARP(arphdr_1490_t *ArpPacket, sdla_t *card, netdevice_t* dev)
case 0x09: // Inverse ARP reply
/* Check for valid Address */
printk(KERN_INFO "%s: Recvd PtP addr %s -InArp Reply\n",
((fr_channel_t *)dev->priv)->name, in_ntoa(arphdr->ar_sip));
printk(KERN_INFO "%s: Recvd PtP addr %u.%u.%u.%u -InArp Reply\n",
((fr_channel_t *)dev->priv)->name, NIPQUAD(arphdr->ar_sip));
if ((dev->pa_mask & arphdr->ar_sip) != (dev->pa_mask & dev->pa_addr)) {
printk(KERN_INFO "%s: Invalid PtP address. InARP ignored.\n",
......
drivers/net/wan/sdla_ppp.c
View file @ 4a493922
......@@ -102,7 +102,6 @@
#include <linux/if_arp.h> /* ARPHRD_* defines */
#include <asm/byteorder.h> /* htons(), etc. */
#include <linux/in.h> /* sockaddr_in */
#include <linux/inet.h> /* in_aton(), in_ntoa() prototypes */
/* ---- 2.4.X KERNEL SUPPORT -----------------------*/
......@@ -2269,10 +2268,11 @@ static void process_route (sdla_t *card)
struct in_device *in_dev = dev->ip_ptr;
if (in_dev != NULL ) {
struct in_ifaddr *ifa = in_dev->ifa_list;
printk(KERN_INFO "%s: Assigned Lcl. Addr: %s\n",
card->devname, in_ntoa(ifa->ifa_local));
printk(KERN_INFO "%s: Assigned Rmt. Addr: %s\n",
card->devname, in_ntoa(ifa->ifa_address));
printk(KERN_INFO "%s: Assigned Lcl. Addr: %u.%u.%u.%u\n",
card->devname, NIPQUAD(ifa->ifa_local));
printk(KERN_INFO "%s: Assigned Rmt. Addr: %u.%u.%u.%u\n",
card->devname, NIPQUAD(ifa->ifa_address));
}else{
printk(KERN_INFO
"%s: Error: Failed to add a route for PPP interface %s\n",
......@@ -2294,10 +2294,10 @@ static void process_route (sdla_t *card)
"%s: An error occurred in IP assignment.\n",
card->devname);
} else {
printk(KERN_INFO "%s: Assigned Lcl. Addr: %s\n",
card->devname, in_ntoa(dev->pa_addr));
printk(KERN_INFO "%s: Assigned Rmt. Addr: %s\n",
card->devname, in_ntoa(dev->pa_dstaddr));
printk(KERN_INFO "%s: Assigned Lcl. Addr: %u.%u.%u.%u\n",
card->devname, NIPQUAD(dev->pa_addr));
printk(KERN_INFO "%s: Assigned Rmt. Addr: %u.%u.%u.%U\n",
card->devname, NIPQUAD(dev->pa_dstaddr));
}
}
......@@ -2408,16 +2408,8 @@ static int config508(netdevice_t *dev, sdla_t *card)
/* Debugging code used to check that IP addresses
* obtained from the kernel are correct */
{
char laddr[20];
char raddr[20];
strcpy(laddr,in_ntoa(cfg.ip_local));
strcpy(raddr,in_ntoa(cfg.ip_remote));
NEX_PRINTK(KERN_INFO "Local %s Remote %s Name %s\n",
laddr,raddr, dev->name);
}
NEX_PRINTK(KERN_INFO "Local %u.%u.%u.%u Remote %u.%u.%u.%u Name %s\n",
NIPQUAD(ip_local),NIPQUAD(ip_remote), dev->name);
break;
case WANOPT_PPP_HOST:
......@@ -2436,18 +2428,9 @@ static int config508(netdevice_t *dev, sdla_t *card)
/* Debugging code used to check that IP addresses
* obtained from the kernel are correct */
{
char laddr[20];
char raddr[20];
strcpy(laddr,in_ntoa(cfg.ip_local));
strcpy(raddr,in_ntoa(cfg.ip_remote));
NEX_PRINTK (KERN_INFO "Local %s Remote %s Name %s\n",
laddr,raddr, dev->name);
NEX_PRINTK (KERN_INFO "Local %u.%u.%u.%u Remote %u.%u.%u.%u Name %s\n",
NIPQUAD(ip_local),NIPQUAD(ip_remote), dev->name);
}
break;
case WANOPT_PPP_PEER:
......@@ -3130,10 +3113,10 @@ static int read_info( sdla_t *card )
if (err) {
printk (KERN_INFO "%s: Adding of route failed: %i\n",
card->devname,err);
printk (KERN_INFO "%s: Local : %s\n",
card->devname,in_ntoa(ppp_priv_area->ip_local));
printk (KERN_INFO "%s: Remote: %s\n",
card->devname,in_ntoa(ppp_priv_area->ip_remote));
printk (KERN_INFO "%s: Local : %u.%u.%u.%u\n",
card->devname,NIPQUAD(ppp_priv_area->ip_local));
printk (KERN_INFO "%s: Remote: %u.%u.%u.%u\n",
card->devname,NIPQUAD(ppp_priv_area->ip_remote));
}
return err;
}
......@@ -3212,8 +3195,8 @@ static void remove_route( sdla_t *card )
card->devname, err);
return;
}else{
printk (KERN_INFO "%s: PPP Deleting dynamic route %s successfuly\n",
card->devname, in_ntoa(ip_addr));
printk (KERN_INFO "%s: PPP Deleting dynamic route %u.%u.%u.%u successfuly\n",
card->devname, NIPQUAD(ip_addr));
}
return;
}
......
fs/nfs/mount_clnt.c
View file @ 4a493922
......@@ -13,7 +13,6 @@
#include <linux/uio.h>
#include <linux/net.h>
#include <linux/in.h>
#include <linux/inet.h>
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/xprt.h>
#include <linux/sunrpc/sched.h>
......@@ -69,7 +68,7 @@ nfs_gen_mount(struct sockaddr_in *addr, char *path, struct nfs_fh *fh, int versi
dprintk("NFS: nfs_mount(%08x:%s)\n",
(unsigned)ntohl(addr->sin_addr.s_addr), path);
strcpy(hostname, in_ntoa(addr->sin_addr.s_addr));
sprintf(hostname, "%u.%u.%u.%u", NIPQUAD(addr->sin_addr.s_addr));
if (!(mnt_clnt = mnt_create(hostname, addr, version)))
return -EACCES;
......
fs/nfs/nfsroot.c
View file @ 4a493922
......@@ -78,7 +78,6 @@
#include <linux/nfs_fs.h>
#include <linux/nfs_mount.h>
#include <linux/in.h>
#include <linux/inet.h>
#include <linux/major.h>
#include <linux/utsname.h>
#include <net/ipconfig.h>
......@@ -281,7 +280,8 @@ static int __init root_nfs_addr(void)
return -1;
}
strncpy(nfs_data.hostname, in_ntoa(servaddr), sizeof(nfs_data.hostname)-1);
snprintf(nfs_data.hostname, sizeof(nfs_data.hostname),
"%u.%u.%u.%u", NIPQUAD(servaddr));
return 0;
}
......
include/linux/inet.h
View file @ 4a493922
......@@ -47,7 +47,6 @@
#include <linux/net.h>
extern void inet_proto_init(struct net_proto *pro);
extern char *in_ntoa(__u32 in);
extern __u32 in_aton(const char *str);
#endif
......
include/linux/wanrouter.h
View file @ 4a493922
......@@ -475,7 +475,6 @@ typedef struct wanif_conf
#include <linux/fs.h> /* support for device drivers */
#include <linux/proc_fs.h> /* proc filesystem pragmatics */
#include <linux/inet.h> /* in_aton(), in_ntoa() prototypes */
#include <linux/netdevice.h> /* support for network drivers */
/*----------------------------------------------------------------------------
* WAN device data space.
......
net/ipv4/utils.c
View file @ 4a493922
......@@ -42,21 +42,6 @@
#include <linux/skbuff.h>
/*
* Display an IP address in readable format.
*/
char *in_ntoa(__u32 in)
{
static char buff[18];
char *p;
p = (char *) &in;
sprintf(buff, "%d.%d.%d.%d",
(p[0] & 255), (p[1] & 255), (p[2] & 255), (p[3] & 255));
return(buff);
}
/*
* Convert an ASCII string to binary IP.
*/
......
net/netsyms.c
View file @ 4a493922
......@@ -448,7 +448,6 @@ EXPORT_SYMBOL(ipv4_config);
EXPORT_SYMBOL(dev_open);
/* Used by other modules */
EXPORT_SYMBOL(in_ntoa);
EXPORT_SYMBOL(xrlim_allow);
EXPORT_SYMBOL(ip_rcv);
......
net/sunrpc/pmap_clnt.c
View file @ 4a493922
......@@ -87,8 +87,6 @@ rpc_getport(struct rpc_task *task, struct rpc_clnt *clnt)
}
#ifdef CONFIG_ROOT_NFS
char *in_ntoa(__u32 in);
int
rpc_getport_external(struct sockaddr_in *sin, __u32 prog, __u32 vers, int prot)
{
......@@ -100,7 +98,7 @@ rpc_getport_external(struct sockaddr_in *sin, __u32 prog, __u32 vers, int prot)
dprintk("RPC: rpc_getport_external(%u.%u.%u.%u, %d, %d, %d)\n",
NIPQUAD(sin->sin_addr.s_addr), prog, vers, prot);
strcpy(hostname, in_ntoa(sin->sin_addr.s_addr));
sprintf(hostname, "%u.%u.%u.%u", NIPQUAD(sin->sin_addr.s_addr));
if (!(pmap_clnt = pmap_create(hostname, sin, prot)))
return -EACCES;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7