webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-12 20:16:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Browse Source 
Conflicts:
	config/rootfiles/core/next/filelists/files
This commit is contained in:
Michael Tremer
2011-09-04 15:52:11 +02:00
parent bb4cfcc1bf e57d2133a3
commit 3ea9703e69
8 changed files with 1577 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/rootfiles/common/openvpn
View File

@@ -1,6 +1,8 @@
lib/openvpn-auth-pam.so
lib/openvpn-down-root.so
usr/sbin/openvpn
#usr/share/doc/openvpn
#usr/share/doc/openvpn/management-notes.txt
#usr/share/man/man8/openvpn.8
var/ipfire/ovpn
var/ipfire/ovpn/ca
@@ -11,7 +13,7 @@ var/ipfire/ovpn/certs/serial
var/ipfire/ovpn/crls
#var/ipfire/ovpn/openssl
var/ipfire/ovpn/openssl/ovpn.cnf
var/ipfire/ovpn/ovpn-leases.db
var/ipfire/ovpn/ovpnconfig
var/ipfire/ovpn/settings
var/ipfire/ovpn/verify
var/ipfire/ovpn/ovpn-leases.db

359
config/rootfiles/core/next/filelists/compat-wireless Normal file
View File

@@ -0,0 +1,359 @@
lib/modules/2.6.32.45-ipfire-xen/kernel/compat/compat.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/compat/compat_firmware_class.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/ath3k.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bcm203x.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bfusb.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bluecard_cs.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bpa10x.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bt3c_cs.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btmrvl.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btmrvl_sdio.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btsdio.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btuart_cs.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btusb.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/dtl1_cs.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/hci_uart.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/hci_vhci.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/atl1c/atl1c.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/atl1e/atl1e.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/atlx/atl1.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/atlx/atl2.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/b44.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/asix.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/catc.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/cdc_eem.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/cdc_ether.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/cdc_subset.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/dm9601.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/gl620a.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/hso.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/int51x1.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/kaweth.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/mcs7830.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/net1080.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/pegasus.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/plusb.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/rndis_host.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/rtl8150.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/smsc95xx.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/usbnet.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/zaurus.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/adm8211.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/at76c50x-usb.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/libipw.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwl-legacy.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_cs.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas/usb8xxx.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/mac80211_hwsim.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/mwl8k.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rndis_wlan.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/wl1251/wl1251.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl12xx.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/ssb/ssb.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/staging/ath6kl/ath6kl.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/staging/brcm80211/brcmfmac/brcmfmac.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/staging/brcm80211/brcmsmac/brcmsmac.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/staging/brcm80211/util/brcmutil.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/bluetooth.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/bnep/bnep.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/cmtp/cmtp.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/hidp/hidp.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/rfcomm/rfcomm.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/net/mac80211/mac80211.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/cfg80211.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/lib80211.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/lib80211_crypt_ccmp.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/lib80211_crypt_tkip.ko
lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/lib80211_crypt_wep.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/compat/compat.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/compat/compat_firmware_class.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/ath3k.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bcm203x.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bfusb.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bluecard_cs.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bpa10x.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bt3c_cs.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btmrvl.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btmrvl_sdio.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btsdio.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btuart_cs.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btusb.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/dtl1_cs.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/hci_uart.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/hci_vhci.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/atl1c/atl1c.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/atl1e/atl1e.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/atlx/atl1.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/atlx/atl2.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/b44.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/asix.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/catc.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/cdc_eem.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/cdc_ether.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/cdc_subset.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/dm9601.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/gl620a.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/hso.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/int51x1.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/kaweth.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/mcs7830.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/net1080.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/pegasus.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/plusb.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/rndis_host.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/rtl8150.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/smsc95xx.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/usbnet.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/zaurus.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/adm8211.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/at76c50x-usb.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/b43/b43.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/libipw.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwl-legacy.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas_cs.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas/usb8xxx.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/mac80211_hwsim.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/mwl8k.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/p54/p54common.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/p54/p54pci.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/p54/p54usb.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rndis_wlan.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/wl1251/wl1251.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/wl12xx/wl12xx.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/ssb/ssb.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/staging/ath6kl/ath6kl.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/staging/brcm80211/brcmfmac/brcmfmac.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/staging/brcm80211/brcmsmac/brcmsmac.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/staging/brcm80211/util/brcmutil.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/bluetooth.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/bnep/bnep.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/cmtp/cmtp.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/hidp/hidp.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/rfcomm/rfcomm.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/net/mac80211/mac80211.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/cfg80211.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/lib80211.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/lib80211_crypt_ccmp.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/lib80211_crypt_tkip.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/lib80211_crypt_wep.ko
lib/modules/2.6.32.45-ipfire/kernel/compat/compat.ko
lib/modules/2.6.32.45-ipfire/kernel/compat/compat_firmware_class.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/ath3k.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bcm203x.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bfusb.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bluecard_cs.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bpa10x.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bt3c_cs.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btmrvl.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btmrvl_sdio.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btsdio.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btuart_cs.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btusb.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/dtl1_cs.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/hci_uart.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/hci_vhci.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/atl1c/atl1c.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/atl1e/atl1e.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/atlx/atl1.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/atlx/atl2.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/b44.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/asix.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/catc.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/cdc_eem.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/cdc_ether.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/cdc_subset.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/dm9601.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/gl620a.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/hso.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/int51x1.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/kaweth.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/mcs7830.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/net1080.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/pegasus.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/plusb.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/rndis_host.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/rtl8150.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/smsc95xx.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/usbnet.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/zaurus.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/adm8211.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/at76c50x-usb.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/b43/b43.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ipw2x00/libipw.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwlegacy/iwl-legacy.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas/libertas.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas/libertas_cs.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas/usb8xxx.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/mwl8k.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/p54/p54common.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/p54/p54pci.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/p54/p54usb.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rndis_wlan.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/wl1251/wl1251.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/wl12xx/wl12xx.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/ssb/ssb.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/staging/ath6kl/ath6kl.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/staging/brcm80211/brcmfmac/brcmfmac.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/staging/brcm80211/brcmsmac/brcmsmac.ko
lib/modules/2.6.32.45-ipfire/kernel/drivers/staging/brcm80211/util/brcmutil.ko
lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/bluetooth.ko
lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/bnep/bnep.ko
lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/cmtp/cmtp.ko
lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/hidp/hidp.ko
lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/rfcomm/rfcomm.ko
lib/modules/2.6.32.45-ipfire/kernel/net/mac80211/mac80211.ko
lib/modules/2.6.32.45-ipfire/kernel/net/wireless/cfg80211.ko
lib/modules/2.6.32.45-ipfire/kernel/net/wireless/lib80211.ko
lib/modules/2.6.32.45-ipfire/kernel/net/wireless/lib80211_crypt_ccmp.ko
lib/modules/2.6.32.45-ipfire/kernel/net/wireless/lib80211_crypt_tkip.ko
lib/modules/2.6.32.45-ipfire/kernel/net/wireless/lib80211_crypt_wep.ko
etc/udev/rules.d/50-compat_firmware.rules
lib/udev/compat_firmware.sh

7
config/rootfiles/core/next/filelists/files
View File

@@ -3,8 +3,14 @@ etc/rc.d/init.d/static-routing
etc/sysctl.conf
etc/system-release
etc/issue
etc/iproute2/rt_tables
etc/rc.d/init.d/networking/red
etc/rc.d/init.d/static-routes
srv/web/ipfire/cgi-bin/extrahd.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/outgoinggrp.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/routing.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
var/ipfire/langs/de.pl
@@ -13,6 +19,7 @@ var/ipfire/langs/es.pl
var/ipfire/langs/fr.pl
var/ipfire/langs/pl.pl
usr/local/bin/ipsecctrl
usr/local/bin/openvpnctrl
usr/local/bin/vpn-watch
usr/local/bin/rebuildroutes
var/ipfire/main/routing

11
config/rootfiles/core/next/update.sh
View File

@@ -57,6 +57,11 @@ rm -rf /etc/usb_modeswitch.d
#Extract files
extract_files
#
#Replace now unsupported EU regdomain by a "DE" comment.
sed -i -e "s|^options cfg80211 ieee80211_regdom=EU|#options cfg80211 ieee80211_regdom=DE|g" \
/etc/modprobe.d/cfg80211
#
#Start services
@@ -69,9 +74,9 @@ fi
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#Rebuild module dep's
#depmod 2.6.32.45-ipfire >/dev/null 2>&1
#depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1
#depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1
depmod 2.6.32.45-ipfire >/dev/null 2>&1
depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1
depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1
## Change version of Pakfire.conf
##

19
html/cgi-bin/index.cgi
View File

@@ -390,6 +390,25 @@ END
END
}
###
# m.a.d n2n
###
if ( -d "${General::swroot}/ovpn/n2nconf") {
my %confighash=();
&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
foreach my $dkey (keys %confighash) {
if ($confighash{$dkey}[0] eq 'on' && $confighash{$dkey}[3] eq 'net') {
my @n2novpnet = split(/\//,$confighash{$dkey}[27]);
print <<END;
<tr><td align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN n2n</b></font></a><br>
<td width='30%' align='center'> $n2novpnet[0]
<td width='45%' align='center'><font color=$Header::colourblue>$confighash{$dkey}[6]</font>
END
}
}
}
# Fireinfo
if ( ! -e "/var/ipfire/main/send_profile") {
$warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>";

993
html/cgi-bin/ovpnmain.cgi
View File

File diff suppressed because it is too large Load Diff

8
lfs/openvpn
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 2.1.2
VER = 2.2.1
THISAPP = openvpn-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 543a30dafcdefe1d67c0e47b80741755
$(DL_FILE)_MD5 = 500bee5449b29906150569aaf2eb2730
install : $(TARGET)
@@ -77,6 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire
cd $(DIR_APP)/plugin/auth-pam && make
cp -pvf $(DIR_APP)/plugin/auth-pam/openvpn-auth-pam.so /lib/
cd $(DIR_APP)/plugin/down-root && make
cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /lib/
-mkdir -vp /var/ipfire/ovpn/ca
-mkdir -vp /var/ipfire/ovpn/crls
touch /var/ipfire/ovpn/ovpn-leases.db

313
src/misc-progs/openvpnctrl.c
View File

@@ -1,3 +1,4 @@
#include <signal.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
@@ -24,7 +25,17 @@ char enableorange[STRING_SIZE] = "off";
char OVPNRED[STRING_SIZE] = "OVPN";
char OVPNBLUE[STRING_SIZE] = "OVPN_BLUE_";
char OVPNORANGE[STRING_SIZE] = "OVPN_ORANGE_";
char WRAPPERVERSION[STRING_SIZE] = "2.0.1.6";
char WRAPPERVERSION[STRING_SIZE] = "ipfire-2.2.0";
struct connection_struct {
char name[STRING_SIZE];
char type[STRING_SIZE];
char proto[STRING_SIZE];
int port;
struct connection_struct *next;
};
typedef struct connection_struct connection;
void exithandler(void)
{
@@ -37,9 +48,9 @@ void exithandler(void)
void usage(void)
{
#ifdef ovpndebug
printf("Wrapper for OpenVPN v%s-debug\n", WRAPPERVERSION);
printf("Wrapper for OpenVPN %s-debug\n", WRAPPERVERSION);
#else
printf("Wrapper for OpenVPN v%s\n", WRAPPERVERSION);
printf("Wrapper for OpenVPN %s\n", WRAPPERVERSION);
#endif
printf("openvpnctrl <option>\n");
printf(" Valid options are:\n");
@@ -49,6 +60,12 @@ void usage(void)
printf(" kills/stops OpenVPN\n");
printf(" -r --restart\n");
printf(" restarts OpenVPN (implicitly creates chains and firewall rules)\n");
printf(" -sn2n --start-net-2-net\n");
printf(" starts all net2net connections\n");
printf(" you may pass a connection name to the switch to only start a specific one\n");
printf(" -kn2n --kill-net-2-net\n");
printf(" kills all net2net connections\n");
printf(" you may pass a connection name to the switch to only start a specific one\n");
printf(" -d --display\n");
printf(" displays OpenVPN status to syslog\n");
printf(" -fwr --firewall-rules\n");
@@ -62,6 +79,72 @@ void usage(void)
exit(1);
}
connection *getConnections() {
FILE *fp = NULL;
if (!(fp = fopen(CONFIG_ROOT "/ovpn/ovpnconfig", "r"))) {
fprintf(stderr, "Could not open openvpn n2n configuration file.\n");
exit(1);
}
char line[STRING_SIZE] = "";
char *result;
int count;
connection *conn_first = NULL;
connection *conn_last = NULL;
connection *conn_curr;
while ((fgets(line, STRING_SIZE, fp) != NULL)) {
if (line[strlen(line) - 1] == '\n')
line[strlen(line) - 1] = '\0';
conn_curr = (connection *)malloc(sizeof(connection));
memset(conn_curr, 0, sizeof(connection));
if (conn_first == NULL) {
conn_first = conn_curr;
} else {
conn_last->next = conn_curr;
}
conn_last = conn_curr;
count = 0;
result = strtok(line, ",");
while (result) {
if (count == 2) {
strcpy(conn_curr->name, result);
} else if (count == 4) {
strcpy(conn_curr->type, result);
} else if (count == 12) {
strcpy(conn_curr->proto, result);
} else if (count == 13) {
conn_curr->port = atoi(result);
}
result = strtok(NULL, ",");
count++;
}
}
fclose(fp);
return conn_first;
}
int readPidFile(const char *pidfile) {
FILE *fp = fopen(pidfile, "r");
if (fp == NULL) {
fprintf(stderr, "PID file not found: '%s'\n", pidfile);
exit(1);
}
int pid = 0;
fscanf(fp, "%d", &pid);
fclose(fp);
return pid;
}
void ovpnInit(void) {
// Read OpenVPN configuration
@@ -139,7 +222,7 @@ void executeCommand(char *command) {
void setChainRules(char *chain, char *interface, char *protocol, char *port)
{
char str[STRING_SIZE];
sprintf(str, "/sbin/iptables -A %sINPUT -i %s -p %s --dport %s -j ACCEPT", chain, interface, protocol, port);
executeCommand(str);
sprintf(str, "/sbin/iptables -A %sINPUT -i tun+ -j ACCEPT", chain);
@@ -208,39 +291,34 @@ void createChain(char *chain) {
}
void createAllChains(void) {
if (!((strcmp(enablered, "on")==0) || (strcmp(enableblue, "on")==0) || (strcmp(enableorange, "on")==0))){
fprintf(stderr, "OpenVPN is not enabled on any interface\n");
exit(1);
} else {
// create chain and chain references
if (!strcmp(enableorange, "on")) {
if (strlen(orangeif)) {
createChain(OVPNORANGE);
createChainReference(OVPNORANGE);
} else {
fprintf(stderr, "OpenVPN enabled on orange but no orange interface found\n");
//exit(1);
}
// create chain and chain references
if (!strcmp(enableorange, "on")) {
if (strlen(orangeif)) {
createChain(OVPNORANGE);
createChainReference(OVPNORANGE);
} else {
fprintf(stderr, "OpenVPN enabled on orange but no orange interface found\n");
//exit(1);
}
if (!strcmp(enableblue, "on")) {
if (strlen(blueif)) {
createChain(OVPNBLUE);
createChainReference(OVPNBLUE);
} else {
fprintf(stderr, "OpenVPN enabled on blue but no blue interface found\n");
//exit(1);
}
}
if (!strcmp(enableblue, "on")) {
if (strlen(blueif)) {
createChain(OVPNBLUE);
createChainReference(OVPNBLUE);
} else {
fprintf(stderr, "OpenVPN enabled on blue but no blue interface found\n");
//exit(1);
}
if (!strcmp(enablered, "on")) {
if (strlen(redif)) {
createChain(OVPNRED);
createChainReference(OVPNRED);
} else {
fprintf(stderr, "OpenVPN enabled on red but no red interface found\n");
//exit(1);
}
}
if (!strcmp(enablered, "on")) {
if (strlen(redif)) {
createChain(OVPNRED);
createChainReference(OVPNRED);
} else {
fprintf(stderr, "OpenVPN enabled on red but no red interface found\n");
//exit(1);
}
}
}
@@ -250,12 +328,6 @@ void setFirewallRules(void) {
char dport[STRING_SIZE] = "";
char dovpnip[STRING_SIZE] = "";
/* check if it makes sence to proceed further */
if (!((strcmp(enablered, "on")==0) || (strcmp(enableblue, "on")==0) || (strcmp(enableorange, "on")==0))){
fprintf(stderr, "Config error, at least one device must be enabled\n");
exit(1);
}
kv = initkeyvalues();
if (!readkeyvalues(kv, CONFIG_ROOT "/ovpn/settings"))
{
@@ -280,6 +352,11 @@ void setFirewallRules(void) {
}
freekeyvalues(kv);
// Flush all chains.
flushChain(OVPNRED);
flushChain(OVPNBLUE);
flushChain(OVPNORANGE);
// set firewall rules
if (!strcmp(enablered, "on") && strlen(redif))
setChainRules(OVPNRED, redif, protocol, dport);
@@ -287,17 +364,36 @@ void setFirewallRules(void) {
setChainRules(OVPNBLUE, blueif, protocol, dport);
if (!strcmp(enableorange, "on") && strlen(orangeif))
setChainRules(OVPNORANGE, orangeif, protocol, dport);
// read connection configuration
connection *conn = getConnections();
// set firewall rules for n2n connections
char command[STRING_SIZE];
while (conn != NULL) {
if (strcmp(conn->type, "net") == 0) {
sprintf(command, "/sbin/iptables -A %sINPUT -i %s -p %s --dport %d -j ACCEPT",
OVPNRED, redif, conn->proto, conn->port);
executeCommand(command);
}
conn = conn->next;
}
}
void stopDaemon(void) {
char command[STRING_SIZE];
snprintf(command, STRING_SIZE - 1, "/bin/killall openvpn");
executeCommand(command);
int pid = readPidFile("/var/run/openvpn.pid");
if (!pid > 0) {
exit(1);
}
fprintf(stderr, "Killing PID %d.\n", pid);
kill(pid, SIGTERM);
snprintf(command, STRING_SIZE - 1, "/bin/rm -f /var/run/openvpn.pid");
executeCommand(command);
snprintf(command, STRING_SIZE-1, "/sbin/modprobe -r tun");
executeCommand(command);
}
void startDaemon(void) {
@@ -314,6 +410,106 @@ void startDaemon(void) {
}
}
void startNet2Net(char *name) {
connection *conn = NULL;
connection *conn_iter;
conn_iter = getConnections();
while (conn_iter) {
if ((strcmp(conn_iter->type, "net") == 0) && (strcmp(conn_iter->name, name) == 0)) {
conn = conn_iter;
break;
}
conn_iter = conn_iter->next;
}
if (conn == NULL) {
fprintf(stderr, "Connection not found.\n");
exit(1);
}
char configfile[STRING_SIZE];
snprintf(configfile, STRING_SIZE - 1, CONFIG_ROOT "/ovpn/n2nconf/%s/%s.conf",
conn->name, conn->name);
FILE *fp = fopen(configfile, "r");
if (fp == NULL) {
fprintf(stderr, "Could not find configuration file for connection '%s' at '%s'.\n",
conn->name, configfile);
exit(2);
}
fclose(fp);
// Make sure all firewall rules are up to date.
setFirewallRules();
char command[STRING_SIZE];
snprintf(command, STRING_SIZE-1, "/sbin/modprobe tun");
executeCommand(command);
snprintf(command, STRING_SIZE-1, "/usr/sbin/openvpn --config %s", configfile);
executeCommand(command);
}
void killNet2Net(char *name) {
connection *conn = NULL;
connection *conn_iter;
conn_iter = getConnections();
while (conn_iter) {
if (strcmp(conn_iter->name, name) == 0) {
conn = conn_iter;
break;
}
conn_iter = conn_iter->next;
}
if (conn == NULL) {
fprintf(stderr, "Connection not found.\n");
exit(1);
}
char pidfile[STRING_SIZE];
snprintf(pidfile, STRING_SIZE - 1, "/var/run/%sn2n.pid", conn->name);
int pid = readPidFile(pidfile);
if (!pid > 0) {
exit(1);
}
fprintf(stderr, "Killing PID %d.\n", pid);
kill(pid, SIGTERM);
char command[STRING_SIZE];
snprintf(command, STRING_SIZE - 1, "/bin/rm -f %s", pidfile);
executeCommand(command);
exit(0);
}
void startAllNet2Net() {
connection *conn = getConnections();
while(conn) {
startNet2Net(conn->name);
conn = conn->next;
}
exit(0);
}
void killAllNet2Net() {
connection *conn = getConnections();
while(conn) {
killNet2Net(conn->name);
conn = conn->next;
}
exit(0);
}
void displayopenvpn(void) {
char command[STRING_SIZE];
@@ -326,8 +522,23 @@ int main(int argc, char *argv[]) {
exit(1);
if(argc < 2)
usage();
if(argc == 2) {
if(argc == 3) {
ovpnInit();
if( (strcmp(argv[1], "-sn2n") == 0) || (strcmp(argv[1], "--start-net-2-net") == 0) ) {
startNet2Net(argv[2]);
return 0;
}
else if( (strcmp(argv[1], "-kn2n") == 0) || (strcmp(argv[1], "--kill-net-2-net") == 0) ) {
killNet2Net(argv[2]);
return 0;
} else {
usage();
return 1;
}
}
else if(argc == 2) {
if( (strcmp(argv[1], "-k") == 0) || (strcmp(argv[1], "--kill") == 0) ) {
stopDaemon();
return 0;
@@ -350,6 +561,14 @@ int main(int argc, char *argv[]) {
startDaemon();
return 0;
}
else if( (strcmp(argv[1], "-sn2n") == 0) || (strcmp(argv[1], "--start-net-2-net") == 0) ) {
startAllNet2Net();
return 0;
}
else if( (strcmp(argv[1], "-kn2n") == 0) || (strcmp(argv[1], "--kill-net-2-net") == 0) ) {
killAllNet2Net();
return 0;
}
else if( (strcmp(argv[1], "-sdo") == 0) || (strcmp(argv[1], "--start-daemon-only") == 0) ) {
startDaemon();
return 0;