Skip to content

Commit

Permalink
Temporary removing can from default loaded layers due to #205 and doing
Browse files Browse the repository at this point in the history
a minor release 0.23
  • Loading branch information
phaethon committed Nov 23, 2017
1 parent 8d29b34 commit 42f4780
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion scapy/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ class Conf(ConfClass):
load_layers = [ "l2", "inet", "dhcp", "dns", "dot11", "gprs", "hsrp", "inet6", "ir", "isakmp", "l2tp",
"mgcp", "mobileip", "netbios", "netflow", "ntp", "ppp", "radius", "rip", "rtp",
"sebek", "skinny", "smb", "snmp", "tftp", "x509", "bluetooth", "dhcp6", "llmnr", "sctp", "vrrp",
"ipsec", "can" ]
"ipsec" ]

if not Conf.ipv6_enabled:
log_scapy.warning("IPv6 support disabled in Python. Cannot load scapy IPv6 layers.")
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def make_ezipfile(base_name, base_dir, verbose=0, dry_run=0, **kwargs):

setup(
name = 'scapy-python3',
version = '0.22',
version = '0.23',
packages=['scapy','scapy/arch', 'scapy/arch/windows', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules', 'scapy/crypto', 'scapy/contrib'],
scripts = SCRIPTS,
data_files = [('share/man/man1', ["doc/scapy.1.gz"])],
Expand Down

0 comments on commit 42f4780

Please sign in to comment.