Skip to content

Commit b181992

Browse files
committed
Switched from isc-dhcp-server to dnsmasq due to problems with isc-dhcp in kali-rolling
1 parent 29829ca commit b181992

13 files changed

+30
-46
lines changed

kali-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fi
2121
make
2222

2323
# Install dependencies
24-
apt-get --yes install apache2 dsniff isc-dhcp-server macchanger \
24+
apt-get --yes install apache2 dsniff dnsmasq macchanger \
2525
metasploit-framework python-dnspython python-pcapy python-scapy \
2626
sslsplit stunnel4 tinyproxy procps iptables asleap scapy
2727
make install

run-mana/conf/dhcpd-two.conf

Lines changed: 0 additions & 17 deletions
This file was deleted.

run-mana/conf/dhcpd.conf

Lines changed: 0 additions & 17 deletions
This file was deleted.

run-mana/conf/hostapd-mana-all.conf

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ driver=nl80211
66
ssid=Internet
77
channel=6
88

9+
auth_algs=3
10+
# no SSID cloaking
11+
ignore_broadcast_ssid=0
12+
# Put hostapd in white/black list mode
13+
macaddr_acl=0
14+
# only used if you want to do filter by MAC address
15+
#accept_mac_file=/etc/mana-toolkit/hostapd.accept
16+
#deny_mac_file=/etc/mana-toolkit/hostapd.deny
17+
918
bss=wlan0_0
1019
ssid=InternetSecure
1120
ieee8021x=1
@@ -35,7 +44,7 @@ ap_max_inactivity=3000
3544
auth_algs=3
3645

3746
# no SSID cloaking
38-
ignore_broadcast_ssid=2
47+
ignore_broadcast_ssid=1
3948

4049
# -1 = log all messages
4150
logger_syslog=-1

run-mana/conf/hostapd-mana-eap.conf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ driver=nl80211
66
ssid=AlwaysOn
77
channel=6
88

9+
auth_algs=3
10+
# no SSID cloaking
11+
ignore_broadcast_ssid=0
12+
# Put hostapd in white/black list mode
13+
macaddr_acl=0
14+
# only used if you want to do filter by MAC address
15+
#accept_mac_file=/etc/mana-toolkit/hostapd.accept
16+
#deny_mac_file=/etc/mana-toolkit/hostapd.deny
17+
918
bss=wlan0_0
1019
ssid=AlwaysOnSecure
1120
ieee8021x=1

run-mana/mana-menu.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
#This is a work in progress and not complete, don't use it
23

34
upstream=eth0
45
phy=wlan0

run-mana/start-nat-full.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ sleep 5
2222
ifconfig $phy 10.0.0.1 netmask 255.255.255.0
2323
route add -net 10.0.0.0 netmask 255.255.255.0 gw 10.0.0.1
2424

25-
dhcpd -cf /etc/mana-toolkit/dhcpd.conf $phy
25+
dnsmasq -C /etc/mana-toolkit/dnsmasq-dhcpd.conf $phy
2626

2727
echo '1' > /proc/sys/net/ipv4/ip_forward
2828
iptables --policy INPUT ACCEPT

run-mana/start-nat-simple.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sleep 5
1616
ifconfig $phy 10.0.0.1 netmask 255.255.255.0
1717
route add -net 10.0.0.0 netmask 255.255.255.0 gw 10.0.0.1
1818

19-
dhcpd -cf /etc/mana-toolkit/dhcpd.conf $phy
19+
dnsmasq -C /etc/mana-toolkit/dnsmasq-dhcpd.conf $phy
2020

2121
echo '1' > /proc/sys/net/ipv4/ip_forward
2222
iptables --policy INPUT ACCEPT

run-mana/start-noupstream-all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ route add -net 10.0.0.0 netmask 255.255.255.0 gw 10.0.0.1
3232
ifconfig $phy0 10.1.0.1 netmask 255.255.255.0
3333
route add -net 10.1.0.0 netmask 255.255.255.0 gw 10.1.0.1
3434

35-
dhcpd -cf /etc/mana-toolkit/dhcpd.conf $phy
36-
dhcpd -pf /var/run/dhcpd-two.pid -lf /var/lib/dhcp/dhcpd-two.leases -cf /etc/mana-toolkit/dhcpd-two.conf $phy0
35+
dnsmasq -z -C /etc/mana-toolkit/dnsmasq-dhcpd.conf -i $phy -I lo
36+
dnsmasq -z -C /etc/mana-toolkit/dnsmasq-dhcpd-two.conf -i $phy0 -I lo
3737
dnsspoof -i $phy -f /etc/mana-toolkit/dnsspoof.conf&
3838
dnsspoof -i $phy0 -f /etc/mana-toolkit/dnsspoof.conf&
3939
service apache2 start

run-mana/start-noupstream-eap.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ route add -net 10.0.0.0 netmask 255.255.255.0 gw 10.0.0.1
3232
ifconfig $phy0 10.1.0.1 netmask 255.255.255.0
3333
route add -net 10.1.0.0 netmask 255.255.255.0 gw 10.1.0.1
3434

35-
dhcpd -cf /etc/mana-toolkit/dhcpd.conf $phy
36-
touch /var/lib/dhcp/dhcpd-two.leases
37-
dhcpd -pf /var/run/dhcpd-two.pid -lf /var/lib/dhcp/dhcpd-two.leases -cf /etc/mana-toolkit/dhcpd-two.conf $phy0
35+
dnsmasq -z -C /etc/mana-toolkit/dnsmasq-dhcpd.conf -i $phy -I lo
36+
dnsmasq -z -C /etc/mana-toolkit/dnsmasq-dhcpd-two.conf -i $phy0 -I lo
3837
dnsspoof -i $phy -f /etc/mana-toolkit/dnsspoof.conf&
3938
dnsspoof -i $phy0 -f /etc/mana-toolkit/dnsspoof.conf&
4039
service apache2 start

0 commit comments

Comments
 (0)