Changeset 31965


Ignore:
Timestamp:
2012-05-29T02:54:02+02:00 (6 years ago)
Author:
jow
Message:

[packages] djbdns: use network.sh to find ip addresses

Location:
packages/net/djbdns
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • packages/net/djbdns/Makefile

    r29199 r31965  
    11# 
    2 # Copyright (C) 2007-2011 OpenWrt.org 
     2# Copyright (C) 2007-2012 OpenWrt.org 
    33# Original port by FreeWRT project. 
    44# 
     
    1515PKG_NAME:=djbdns 
    1616PKG_VERSION:=1.05 
    17 PKG_RELEASE:=6 
     17PKG_RELEASE:=7 
    1818 
    1919PKG_SOURCE:=${PKG_NAME}-${PKG_VERSION}.tar.gz 
  • packages/net/djbdns/files/axfrdns.init

    r15612 r31965  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2007 OpenWrt.org 
     2# Copyright (C) 2007-2012 OpenWrt.org 
    33# 
    44# version 20090401 jhalfmoon 
     
    4747    [ -z $AXFR ] && export -n AXFR 
    4848# Translate listening interfaces to ip addresses 
    49     include /lib/network 
    50     scan_interfaces 
    51     config_get IP "$iface" ipaddr 
     49    . /lib/functions/network.sh 
     50    network_get_ipaddr IP "$iface" || return 1 
    5251    export ROOT 
    5352    if [ "$DEBUG" == 1 ] ; then 
  • packages/net/djbdns/files/dnscache.init

    r17673 r31965  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2007 OpenWrt.org 
     2# Copyright (C) 2007-2012 OpenWrt.org 
    33 
    44# Preferably start dnscache after udhcpd/dnsmasq, to be sure /etc/resolv.conf is set correctly. dnsmasq is at S60, so dnscache is put at S65 as seen below. If /etc/resolv.conf is not used, then dnscache may be started at S47, just after the firewall has been set up. 
     
    5656    fi 
    5757# Add some interface network addresses to list of allowed IP addresses (assumes /24 networks) 
    58     include /lib/network 
    59     scan_interfaces 
     58    . /lib/functions/network.sh 
    6059    if [ -n "$defaultallowif" ] ; then 
    6160        for myinterface in `echo $defaultallowif`; do 
    62             config_get addr $myinterface ipaddr 
     61            network_get_ipaddr addr $myinterface || continue 
    6362            # the next line strips the last octet from the ip address 
    6463            addr=`echo $addr|sed 's/.[0-9]\+$//'` 
     
    6867    fi 
    6968# Translate listen interface names to IP addresses 
    70     config_get IP "$iface" ipaddr 
    71 # Translante send interface name to an IP address 
    72     config_get IPSEND "$ifacesend" ipaddr 
     69    network_get_ipaddr IP "$iface" 
     70# Translate send interface name to an IP address 
     71    network_get_ipaddr IPSEND "$ifacesend" 
    7372# Unset HIDETTL if equal to 0 
    7473    if [ "$HIDETTL" == "0" ] ; then 
  • packages/net/djbdns/files/rbldns.init

    r15612 r31965  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2007 OpenWrt.org 
     2# Copyright (C) 2007-2012 OpenWrt.org 
    33# 
    44# version 20090401 jhalfmoon 
     
    4141    [ -z $BASE ] && export -n BASE 
    4242# Translate listening interfaces to ip addresses 
    43     include /lib/network 
    44     scan_interfaces 
    45     config_get IP "$iface" ipaddr 
     43    . /lib/functions/network.sh 
     44    network_get_ipaddr IP "$iface" 
    4645    export ROOT 
    4746    if [ "$DEBUG" == 1 ] ; then 
  • packages/net/djbdns/files/tinydns.init

    r15612 r31965  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2007 OpenWrt.org 
     2# Copyright (C) 2007-2012 OpenWrt.org 
    33# 
    44# version 20090401 jhalfmoon 
     
    3636    config_get logging "$cfg" logging 
    3737    config_get iface   "$cfg" interface 
    38     include /lib/network 
    39     scan_interfaces 
    4038# Translate listening interfaces to ip addresses 
    41     config_get IP "$iface" ipaddr 
     39    . /lib/functions/network.sh 
     40    network_get_ipaddr IP "$iface" 
    4241    export ROOT 
    4342    if [ "$DEBUG" == 1 ] ; then 
  • packages/net/djbdns/files/walldns.init

    r15612 r31965  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2007 OpenWrt.org 
     2# Copyright (C) 2007-2012 OpenWrt.org 
    33# 
    44# version 20090401 jhalfmoon 
     
    3535    config_get iface   "$cfg" interface 
    3636# Translate listening interfaces to ip addresses 
    37     include /lib/network 
    38     scan_interfaces 
    39     config_get IP "$iface" ipaddr 
     37    . /lib/functions/network.sh 
     38    network_get_ipaddr IP "$iface" 
    4039    export ROOT 
    4140    if [ "$DEBUG" == 1 ] ; then 
Note: See TracChangeset for help on using the changeset viewer.