[projects/rc-scripts] Remove internal ipcalc in favor of more feature rich external one
baggins
baggins at pld-linux.org
Sat Sep 11 13:40:37 CEST 2021
commit a91073533505e510084c01a09648200e0488e94b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Sep 11 13:39:22 2021 +0200
Remove internal ipcalc in favor of more feature rich external one
.gitignore | 1 -
README | 11 +-
lib/ifup-post | 5 +-
man/Makefile.am | 1 -
man/ipcalc.1 | 58 ---------
src/Makefile.am | 4 -
src/ipcalc.c | 361 --------------------------------------------------------
7 files changed, 10 insertions(+), 431 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6337d3ca..a909fb23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,7 +50,6 @@ src/doexec
src/genhostid
src/getkey
src/initlog
-src/ipcalc
src/loglevel
src/minilogd
src/netreport
diff --git a/README b/README
index 2505e6d3..56b8b3d1 100644
--- a/README
+++ b/README
@@ -18,15 +18,16 @@ To use IPv6 networking you should compile:
Networking options --->
<*/M> The IPv6 protocol (EXPERIMENTAL)
- [*] IPv6: enable EUI-64 token format
- [*] IPv6: disable provider based addresses
+ [*] IPv6: enable EUI-64 token format
+ [*] IPv6: disable provider based addresses
-too.
+too.
Other required or suggested packages:
| What? | Package |
+-------------+-------------------------------+
+ 6to4 ipcalc
IPX ncfps
fourtun fourtun and kernel module
bridge bridge-utils
@@ -35,7 +36,7 @@ Other required or suggested packages:
serial/ppp ppp, dip, wvdial
serial/slip slattach
PPPoE pppd + rp-pppoe (plugin or userspace program)
-
+
Also you should know that format of interface configuration
files is totally different from these used in RedHat/Mandrake
initscripts and even from stable rc-scripts branch.
@@ -44,6 +45,6 @@ If you have some bug reports or suggestions please send email
to rc-scripts maintainers at <pld-devel-en at lists.pld-linux.org> or
use our Bug Tracking System ( http://bugs.pld-linux.org/ ).
---
+--
PLD Linux Distribution rc-scripts Team
diff --git a/lib/ifup-post b/lib/ifup-post
index a2713096..5ab4191c 100755
--- a/lib/ifup-post
+++ b/lib/ifup-post
@@ -59,7 +59,10 @@ fi
if [ -n "$NEEDHOSTNAME" -a "${DEVICETYPE}" != "ppp" -a "${DEVICETYPE}" != "slip" ]; then
IPADDR=$(ip -f inet addr show dev ${DEVICE} |
awk '/inet/ { print $2 }' |awk -F"/" '{ print $1 }')
- eval $(/bin/ipcalc --silent --hostname ${IPADDR}) && set_hostname $HOSTNAME
+ if eval $(/bin/ipcalc --silent --hostname ${IPADDR}) ; then
+ [ "${HOSTNAME}" != "${IPADDR}" ] && set_hostname ${HOSTNAME}
+ fi
+
fi
# run tleds software
diff --git a/man/Makefile.am b/man/Makefile.am
index ae48e042..4603c690 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -8,7 +8,6 @@ man_MANS = \
genhostid.1 \
getkey.1 \
initlog.1 \
- ipcalc.1 \
netreport.1 \
ppp-watch.8 \
usernetctl.8 \
diff --git a/man/ipcalc.1 b/man/ipcalc.1
deleted file mode 100644
index fd9b2121..00000000
--- a/man/ipcalc.1
+++ /dev/null
@@ -1,58 +0,0 @@
-.TH IPCALC 1 "April 30 2001" "Red Hat, Inc." RH \" -*- nroff -*-
-.SH NAME
-ipcalc \- perform simple manipulation of IP addresses
-.SH SYNOPSIS
-.B ipcalc
-[\fIOPTION\fR]... <\fBIP address\fR>[\fI/prefix\fR] [\fInetmask\fR]
-
-.SH DESCRIPTION
-\fBipcalc\fR provides a simple way to calculate IP information for a host.
-The various options specify what information \fBipcalc\fR should display
-on standard out. Multiple options may be specified. An IP address to
-operate on must always be specified. Most operations also require a
-netmask or a CIDR prefix as well.
-
-.SH OPTIONS
-.TP
-.TP
-\fB\-b\fR, \fB\-\-broadcast\fR
-Display the broadcast address for the given IP address and netmask.
-
-.TP
-\fB\-h\fR, \fB\-\-hostname\fR
-Display the hostname for the given IP address.
-
-.TP
-\fB\-m\fR, \fB\-\-netmask\fR
-Calculate the netmask for the given IP address. It assumes that the IP
-address is in a complete class A, B, or C network. Many networks do
-not use the default netmasks, in which case an inappropriate value will
-be returned.
-
-.TP
-\fB\-p\fR, \fB\-\-prefix\fR
-Show the prefix for the given mask/IP address.
-
-.TP
-\fB\-n\fR, \fB\-\-network\fR
-Display the network address for the given IP address and netmask.
-
-.TP
-\fB\-s\fR, \fB\-\-silent\fR
-Don't ever display error messages.
-
-.SH AUTHORS
-.nf
-Erik Troan <ewt at redhat.com>
-.nf
-Preston Brown <pbrown at redhat.com>
-.fi
-.SH "REPORTING BUGS"
-Report bugs to our bugtracking system:
-http://bugzilla.redhat.com/bugzilla.
-.SH COPYRIGHT
-Copyright \(co 1997-2001 Red Hat, Inc.
-.br
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
diff --git a/src/Makefile.am b/src/Makefile.am
index cd771397..79acf54a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,6 @@ sysconf_DATA = \
bin_PROGRAMS = \
doexec \
- ipcalc \
usleep \
run-parts \
resolvesymlink
@@ -34,9 +33,6 @@ doexec_SOURCES = doexec.c
resolvesymlink_SOURCES = resolvesymlink.c
-ipcalc_SOURCES = ipcalc.c
-ipcalc_LDADD = -lpopt
-
genhostid_SOURCES = genhostid.c
netreport_SOURCES = netreport.c
diff --git a/src/ipcalc.c b/src/ipcalc.c
deleted file mode 100644
index f133412c..00000000
--- a/src/ipcalc.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * Copyright (c) 1997-2003 Red Hat, Inc. All rights reserved.
- *
- * This software may be freely redistributed under the terms of the GNU
- * public license.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Authors:
- * Erik Troan <ewt at redhat.com>
- * Preston Brown <pbrown at redhat.com>
- */
-
-
-#include <ctype.h>
-#include <popt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-
-/*!
- \def IPBITS
- \brief the number of bits in an IP address.
-*/
-#define IPBITS (sizeof(u_int32_t) * 8)
-/*!
- \def IPBYTES
- \brief the number of bytes in an IP address.
-*/
-#define IPBYTES (sizeof(u_int32_t))
-
-
-/*!
- \file ipcalc.c
- \brief provides utilities for manipulating IP addresses.
-
- ipcalc provides utilities and a front-end command line interface for
- manipulating IP addresses, and calculating various aspects of an ip
- address/netmask/network address/prefix/etc.
-
- Functionality can be accessed from other languages from the library
- interface, documented here. To use ipcalc from the shell, read the
- ipcalc(1) manual page.
-
- When passing parameters to the various functions, take note of whether they
- take host byte order or network byte order. Most take host byte order, and
- return host byte order, but there are some exceptions.
-
-*/
-
-/*!
- \fn u_int32_t prefix2mask(int bits)
- \brief creates a netmask from a specified number of bits
-
- This function converts a prefix length to a netmask. As CIDR (classless
- internet domain internet domain routing) has taken off, more an more IP
- addresses are being specified in the format address/prefix
- (i.e. 192.168.2.3/24, with a corresponding netmask 255.255.255.0). If you
- need to see what netmask corresponds to the prefix part of the address, this
- is the function. See also \ref mask2prefix.
-
- \param prefix is the number of bits to create a mask for.
- \return a network mask, in network byte order.
-*/
-u_int32_t prefix2mask(int prefix) {
- return htonl(~((1 << (32 - prefix)) - 1));
-}
-
-/*!
- \fn int mask2prefix(u_int32_t mask)
- \brief calculates the number of bits masked off by a netmask.
-
- This function calculates the significant bits in an IP address as specified by
- a netmask. See also \ref prefix2mask.
-
- \param mask is the netmask, specified as an u_int32_teger in network byte order.
- \return the number of significant bits. */
-int mask2prefix(u_int32_t mask)
-{
- int i;
- int count = IPBITS;
-
- for (i = 0; i < IPBITS; i++) {
- if (!(ntohl(mask) & ((2 << i) - 1)))
- count--;
- }
-
- return count;
-}
-
-/*!
- \fn u_int32_t default_netmask(u_int32_t addr)
-
- \brief returns the default (canonical) netmask associated with specified IP
- address.
-
- When the Internet was originally set up, various ranges of IP addresses were
- segmented into three network classes: A, B, and C. This function will return
- a netmask that is associated with the IP address specified defining where it
- falls in the predefined classes.
-
- \param addr an IP address in network byte order.
- \return a netmask in network byte order. */
-u_int32_t default_netmask(u_int32_t addr)
-{
- if (((ntohl(addr) & 0xFF000000) >> 24) <= 127)
- return htonl(0xFF000000);
- else if (((ntohl(addr) & 0xFF000000) >> 24) <= 191)
- return htonl(0xFFFF0000);
- else
- return htonl(0xFFFFFF00);
-}
-
-/*!
- \fn u_int32_t calc_broadcast(u_int32_t addr, int prefix)
-
- \brief calculate broadcast address given an IP address and a prefix length.
-
- \param addr an IP address in network byte order.
- \param prefix a prefix length.
-
- \return the calculated broadcast address for the network, in network byte
- order.
-*/
-u_int32_t calc_broadcast(u_int32_t addr,
- int prefix)
-{
- return (addr & prefix2mask(prefix)) | ~prefix2mask(prefix);
-}
-
-/*!
- \fn u_int32_t calc_network(u_int32_t addr, int prefix)
- \brief calculates the network address for a specified address and prefix.
-
- \param addr an IP address, in network byte order
- \param prefix the network prefix
- \return the base address of the network that addr is associated with, in
- network byte order.
-*/
-u_int32_t calc_network(u_int32_t addr, int prefix)
-{
- return (addr & prefix2mask(prefix));
-}
-
-/*!
- \fn const char *get_hostname(u_int32_t addr)
- \brief returns the hostname associated with the specified IP address
-
- \param addr an IP address to find a hostname for, in network byte order
-
- \return a hostname, or NULL if one cannot be determined. Hostname is stored
- in a static buffer that may disappear at any time, the caller should copy the
- data if it needs permanent storage.
-*/
-const char *get_hostname(u_int32_t addr)
-{
- struct hostent * hostinfo;
- int x;
-
- hostinfo = gethostbyaddr((char *) &addr, sizeof(addr), AF_INET);
- if (!hostinfo)
- return NULL;
-
- for (x=0; hostinfo->h_name[x]; x++) {
- hostinfo->h_name[x] = tolower(hostinfo->h_name[x]);
- }
- return hostinfo->h_name;
-}
-
-/*!
- \fn main(int argc, const char **argv)
- \brief wrapper program for ipcalc functions.
-
- This is a wrapper program for the functions that the ipcalc library provides.
- It can be used from shell scripts or directly from the command line.
-
- For more information, please see the ipcalc(1) man page.
-*/
-int main(int argc, const char **argv) {
- int showBroadcast = 0, showPrefix = 0, showNetwork = 0;
- int showHostname = 0, showNetmask = 0;
- int beSilent = 0;
- int rc;
- poptContext optCon;
- char *ipStr, *prefixStr, *netmaskStr, *hostName, *chptr;
- struct in_addr ip, netmask, network, broadcast;
- int prefix = 0;
- char errBuf[250];
- struct poptOption optionsTable[] = {
- { "broadcast", 'b', 0, &showBroadcast, 0,
- "Display calculated broadcast address", },
- { "hostname", 'h', 0, &showHostname, 0,
- "Show hostname determined via DNS" },
- { "netmask", 'm', 0, &showNetmask, 0,
- "Display default netmask for IP (class A, B, or C)" },
- { "network", 'n', 0, &showNetwork, 0,
- "Display network address", },
- { "prefix", 'p', 0, &showPrefix, 0,
- "Display network prefix", },
- { "silent", 's', 0, &beSilent, 0,
- "Don't ever display error messages " },
- POPT_AUTOHELP
- { NULL, '\0', 0, 0, 0, NULL, NULL }
- };
-
- optCon = poptGetContext("ipcalc", argc, argv, optionsTable, 0);
- poptReadDefaultConfig(optCon, 1);
-
- if ((rc = poptGetNextOpt(optCon)) < -1) {
- if (!beSilent) {
- fprintf(stderr, "ipcalc: bad argument %s: %s\n",
- poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
- poptStrerror(rc));
- poptPrintHelp(optCon, stderr, 0);
- }
- return 1;
- }
-
- if (!(ipStr = (char *) poptGetArg(optCon))) {
- if (!beSilent) {
- fprintf(stderr, "ipcalc: ip address expected\n");
- poptPrintHelp(optCon, stderr, 0);
- }
- return 1;
- }
-
- if (strchr(ipStr,'/') != NULL) {
- prefixStr = strchr(ipStr, '/') + 1;
- prefixStr--;
- *prefixStr = '\0'; /* fix up ipStr */
- prefixStr++;
- } else
- prefixStr = NULL;
-
- if (prefixStr != NULL) {
- prefix = atoi(prefixStr);
- if (prefix == 0) {
- if (!beSilent)
- fprintf(stderr, "ipcalc: bad prefix: %s\n",
- prefixStr);
- return 1;
- }
- }
-
- if (showBroadcast || showNetwork || showPrefix) {
- if (!(netmaskStr = (char *) poptGetArg(optCon)) &&
- (prefix == 0)) {
- if (!beSilent) {
- fprintf(stderr, "ipcalc: netmask or prefix expected\n");
- poptPrintHelp(optCon, stderr, 0);
- }
- return 1;
- } else if (netmaskStr && prefix != 0) {
- if (!beSilent) {
- fprintf(stderr, "ipcalc: both netmask and prefix specified\n");
- poptPrintHelp(optCon, stderr, 0);
- }
- return 1;
- } else if (netmaskStr) {
- if (!inet_aton(netmaskStr, &netmask)) {
- if (!beSilent)
- fprintf(stderr, "ipcalc: bad netmask: %s\n",
- netmaskStr);
- return 1;
- }
- prefix = mask2prefix(netmask.s_addr);
- }
- }
-
- if ((chptr = (char *) poptGetArg(optCon))) {
- if (!beSilent) {
- fprintf(stderr, "ipcalc: unexpected argument: %s\n", chptr);
- poptPrintHelp(optCon, stderr, 0);
- }
- return 1;
- }
-
- /* Handle CIDR entries such as 172/8 */
- if (prefix) {
- char *tmp = ipStr;
- int i;
-
- for(i=3; i> 0; i--) {
- tmp = strchr(tmp,'.');
- if (!tmp)
- break;
- else
- tmp++;
- }
- tmp = NULL;
- for (; i>0; i--) {
- tmp = malloc(strlen(ipStr) + 3);
- sprintf(tmp,"%s.0",ipStr);
- ipStr = tmp;
- }
- }
-
- if (!inet_aton(ipStr, (struct in_addr *) &ip)) {
- if (!beSilent)
- fprintf(stderr, "ipcalc: bad ip address: %s\n", ipStr);
- return 1;
- }
-
-
- if (!(showNetmask|showPrefix|showBroadcast|showNetwork|showHostname)) {
- poptPrintHelp(optCon, stderr, 0);
- return 1;
- }
-
- poptFreeContext(optCon);
-
- /* we know what we want to display now, so display it. */
-
- if (showNetmask) {
- if (prefix) {
- netmask.s_addr = prefix2mask(prefix);
- } else {
- netmask.s_addr = default_netmask(ip.s_addr);
- prefix = mask2prefix(netmask.s_addr);
- }
-
- printf("NETMASK=%s\n", inet_ntoa(netmask));
- }
-
- if (showPrefix) {
- if (!prefix)
- prefix = mask2prefix(ip.s_addr);
- printf("PREFIX=%d\n", prefix);
- }
-
- if (showBroadcast) {
- broadcast.s_addr = calc_broadcast(ip.s_addr, prefix);
- printf("BROADCAST=%s\n", inet_ntoa(broadcast));
- }
-
- if (showNetwork) {
- network.s_addr = calc_network(ip.s_addr, prefix);
- printf("NETWORK=%s\n", inet_ntoa(network));
- }
-
- if (showHostname) {
- if ((hostName = (char *) get_hostname(ip.s_addr)) == NULL) {
- if (!beSilent) {
- sprintf(errBuf, "ipcalc: cannot find hostname for %s", ipStr);
- herror(errBuf);
- }
- return 1;
- }
-
- printf("HOSTNAME=%s\n", hostName);
- }
-
- return 0;
-}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/rc-scripts.git/commitdiff/a91073533505e510084c01a09648200e0488e94b
More information about the pld-cvs-commit
mailing list