git: c1d255d3ffdb - main - wpa: Import wpa_supplicant/hostapd commits up to b4f7506ff
Cy Schubert
cy at FreeBSD.org
Fri Sep 3 13:18:58 UTC 2021
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=c1d255d3ffdbe447de3ab875bf4e7d7accc5bfc5
commit c1d255d3ffdbe447de3ab875bf4e7d7accc5bfc5
Merge: a0c64a443e4c 2f6c3ea9600b
Author: Cy Schubert <cy at FreeBSD.org>
AuthorDate: 2021-09-03 13:07:19 +0000
Commit: Cy Schubert <cy at FreeBSD.org>
CommitDate: 2021-09-03 13:08:41 +0000
wpa: Import wpa_supplicant/hostapd commits up to b4f7506ff
Merge vendor commits 40c7ff83e74eabba5a7e2caefeea12372b2d3f9a,
efec8223892b3e677acb46eae84ec3534989971f, and
2f6c3ea9600b494d24cac5a38c1cea0ac192245e.
Tested by: philip
MFC after: 2 months
contrib/wpa/CONTRIBUTIONS | 5 +-
contrib/wpa/hostapd/Android.mk | 1152 ++
contrib/wpa/hostapd/ChangeLog | 4 +-
contrib/wpa/hostapd/Makefile | 1375 +++
contrib/wpa/hostapd/android.config | 214 +
contrib/wpa/hostapd/config_file.c | 453 +-
contrib/wpa/hostapd/ctrl_iface.c | 908 +-
contrib/wpa/hostapd/defconfig | 35 +-
contrib/wpa/hostapd/hostapd.android.rc | 19 +
contrib/wpa/hostapd/hostapd.conf | 367 +-
contrib/wpa/hostapd/hostapd.wpa_psk | 6 +
contrib/wpa/hostapd/hostapd_cli.c | 128 +-
contrib/wpa/hostapd/main.c | 22 +-
contrib/wpa/hostapd/sae_pk_gen.c | 196 +
contrib/wpa/hs20/client/Makefile | 55 +-
contrib/wpa/hs20/client/est.c | 7 +-
contrib/wpa/hs20/client/oma_dm_client.c | 2 +-
contrib/wpa/hs20/client/osu_client.c | 27 +-
contrib/wpa/hs20/client/osu_client.h | 2 +
contrib/wpa/hs20/client/spp_client.c | 2 +-
contrib/wpa/hs20/server/Makefile | 42 +
contrib/wpa/hs20/server/ca/clean.sh | 13 +
contrib/wpa/hs20/server/ca/est-csrattrs.cnf | 17 +
contrib/wpa/hs20/server/ca/est-csrattrs.sh | 4 +
contrib/wpa/hs20/server/ca/hs20.oid | 7 +
contrib/wpa/hs20/server/ca/ocsp-req.sh | 11 +
contrib/wpa/hs20/server/ca/ocsp-responder-ica.sh | 3 +
contrib/wpa/hs20/server/ca/ocsp-responder.sh | 3 +
contrib/wpa/hs20/server/ca/ocsp-update-cache.sh | 11 +
contrib/wpa/hs20/server/ca/openssl-root.cnf | 125 +
contrib/wpa/hs20/server/ca/openssl.cnf | 200 +
contrib/wpa/hs20/server/ca/setup.sh | 209 +
contrib/wpa/hs20/server/ca/w1fi_logo.png | Bin 0 -> 7549 bytes
contrib/wpa/hs20/server/hs20-osu-server.txt | 262 +
contrib/wpa/hs20/server/hs20_spp_server.c | 207 +
contrib/wpa/hs20/server/spp_server.c | 2933 +++++
contrib/wpa/hs20/server/spp_server.h | 36 +
contrib/wpa/hs20/server/sql-example.txt | 17 +
contrib/wpa/hs20/server/sql.txt | 108 +
contrib/wpa/hs20/server/www/add-free.php | 50 +
contrib/wpa/hs20/server/www/add-mo.php | 56 +
contrib/wpa/hs20/server/www/cert-enroll.php | 39 +
contrib/wpa/hs20/server/www/config.php | 7 +
contrib/wpa/hs20/server/www/est.php | 232 +
contrib/wpa/hs20/server/www/free-remediation.php | 19 +
contrib/wpa/hs20/server/www/free.php | 23 +
contrib/wpa/hs20/server/www/redirect.php | 32 +
contrib/wpa/hs20/server/www/remediation-pw.php | 41 +
contrib/wpa/hs20/server/www/remediation.php | 55 +
contrib/wpa/hs20/server/www/signup.php | 59 +
contrib/wpa/hs20/server/www/spp.php | 168 +
contrib/wpa/hs20/server/www/terms.php | 87 +
contrib/wpa/hs20/server/www/users.php | 377 +
contrib/wpa/src/Makefile | 12 +
contrib/wpa/src/ap/Makefile | 60 +
contrib/wpa/src/ap/acs.c | 357 +-
contrib/wpa/src/ap/airtime_policy.c | 12 +-
contrib/wpa/src/ap/ap_config.c | 298 +-
contrib/wpa/src/ap/ap_config.h | 135 +-
contrib/wpa/src/ap/ap_drv_ops.c | 158 +-
contrib/wpa/src/ap/ap_drv_ops.h | 51 +-
contrib/wpa/src/ap/ap_list.c | 4 -
contrib/wpa/src/ap/authsrv.c | 87 +-
contrib/wpa/src/ap/beacon.c | 609 +-
contrib/wpa/src/ap/beacon.h | 2 +
contrib/wpa/src/ap/ctrl_iface_ap.c | 85 +-
contrib/wpa/src/ap/dfs.c | 330 +-
contrib/wpa/src/ap/dfs.h | 3 +
contrib/wpa/src/ap/dhcp_snoop.c | 8 +-
contrib/wpa/src/ap/dpp_hostapd.c | 1025 +-
contrib/wpa/src/ap/dpp_hostapd.h | 11 +
contrib/wpa/src/ap/drv_callbacks.c | 362 +-
contrib/wpa/src/ap/fils_hlp.c | 36 +-
contrib/wpa/src/ap/gas_serv.c | 10 +-
contrib/wpa/src/ap/hostapd.c | 282 +-
contrib/wpa/src/ap/hostapd.h | 59 +-
contrib/wpa/src/ap/hs20.c | 6 +-
contrib/wpa/src/ap/hw_features.c | 373 +-
contrib/wpa/src/ap/hw_features.h | 22 +-
contrib/wpa/src/ap/ieee802_11.c | 2516 +++-
contrib/wpa/src/ap/ieee802_11.h | 24 +-
contrib/wpa/src/ap/ieee802_11_auth.c | 172 +-
contrib/wpa/src/ap/ieee802_11_auth.h | 17 +-
contrib/wpa/src/ap/ieee802_11_he.c | 189 +-
contrib/wpa/src/ap/ieee802_11_ht.c | 30 +-
contrib/wpa/src/ap/ieee802_11_shared.c | 189 +-
contrib/wpa/src/ap/ieee802_11_vht.c | 176 +-
contrib/wpa/src/ap/ieee802_1x.c | 482 +-
contrib/wpa/src/ap/ieee802_1x.h | 7 +-
contrib/wpa/src/ap/neighbor_db.c | 58 +-
contrib/wpa/src/ap/neighbor_db.h | 1 +
contrib/wpa/src/ap/pmksa_cache_auth.c | 6 +
contrib/wpa/src/ap/preauth_auth.c | 2 +-
contrib/wpa/src/ap/sta_info.c | 111 +-
contrib/wpa/src/ap/sta_info.h | 54 +-
contrib/wpa/src/ap/utils.c | 4 +
contrib/wpa/src/ap/vlan_init.c | 5 +-
contrib/wpa/src/ap/wmm.c | 14 +-
contrib/wpa/src/ap/wnm_ap.c | 83 +-
contrib/wpa/src/ap/wpa_auth.c | 1415 ++-
contrib/wpa/src/ap/wpa_auth.h | 103 +-
contrib/wpa/src/ap/wpa_auth_ft.c | 385 +-
contrib/wpa/src/ap/wpa_auth_glue.c | 343 +-
contrib/wpa/src/ap/wpa_auth_i.h | 71 +-
contrib/wpa/src/ap/wpa_auth_ie.c | 444 +-
contrib/wpa/src/ap/wpa_auth_ie.h | 35 -
contrib/wpa/src/ap/wpa_auth_kay.c | 12 +-
contrib/wpa/src/ap/wps_hostapd.c | 237 +-
contrib/wpa/src/build.rules | 109 +
contrib/wpa/src/common/Makefile | 16 +
contrib/wpa/src/common/brcm_vendor.h | 156 +
contrib/wpa/src/common/common_module_tests.c | 513 +-
contrib/wpa/src/common/defs.h | 86 +-
contrib/wpa/src/common/dhcp.h | 2 +-
contrib/wpa/src/common/dpp.c | 11695 +++++-------------
contrib/wpa/src/common/dpp.h | 248 +-
contrib/wpa/src/common/dpp_auth.c | 1977 +++
contrib/wpa/src/common/dpp_backup.c | 1265 ++
contrib/wpa/src/common/dpp_crypto.c | 3329 +++++
contrib/wpa/src/common/dpp_i.h | 160 +
contrib/wpa/src/common/dpp_pkex.c | 1324 ++
contrib/wpa/src/common/dpp_reconfig.c | 958 ++
contrib/wpa/src/common/dpp_tcp.c | 1824 +++
contrib/wpa/src/common/gas_server.c | 140 +-
contrib/wpa/src/common/gas_server.h | 9 +-
contrib/wpa/src/common/hw_features_common.c | 427 +-
contrib/wpa/src/common/hw_features_common.h | 26 +-
contrib/wpa/src/common/ieee802_11_common.c | 789 +-
contrib/wpa/src/common/ieee802_11_common.h | 70 +-
contrib/wpa/src/common/ieee802_11_defs.h | 249 +-
contrib/wpa/src/common/linux_bridge.h | 39 +
contrib/wpa/src/common/linux_vlan.h | 52 +
contrib/wpa/src/common/ocv.c | 39 +-
contrib/wpa/src/common/ocv.h | 13 +-
contrib/wpa/src/common/privsep_commands.h | 1 +
contrib/wpa/src/common/ptksa_cache.c | 321 +
contrib/wpa/src/common/ptksa_cache.h | 79 +
contrib/wpa/src/common/qca-vendor.h | 4187 ++++++-
contrib/wpa/src/common/sae.c | 1387 ++-
contrib/wpa/src/common/sae.h | 109 +-
contrib/wpa/src/common/sae_pk.c | 884 ++
contrib/wpa/src/common/version.h | 2 +-
contrib/wpa/src/common/wpa_common.c | 1240 +-
contrib/wpa/src/common/wpa_common.h | 207 +-
contrib/wpa/src/common/wpa_ctrl.c | 5 +-
contrib/wpa/src/common/wpa_ctrl.h | 41 +-
contrib/wpa/src/crypto/Makefile | 60 +
contrib/wpa/src/crypto/crypto.h | 49 +-
contrib/wpa/src/crypto/crypto_module_tests.c | 150 +
contrib/wpa/src/crypto/crypto_openssl.c | 250 +
contrib/wpa/src/crypto/crypto_wolfssl.c | 77 +-
contrib/wpa/src/crypto/sha256.c | 6 +-
contrib/wpa/src/crypto/sha384-tlsprf.c | 71 +
contrib/wpa/src/crypto/sha384.c | 6 +-
contrib/wpa/src/crypto/sha384.h | 3 +
contrib/wpa/src/crypto/sha512.c | 6 +-
contrib/wpa/src/crypto/tls.h | 14 +
contrib/wpa/src/crypto/tls_openssl.c | 304 +-
contrib/wpa/src/crypto/tls_wolfssl.c | 65 +-
contrib/wpa/src/drivers/Makefile | 9 +
contrib/wpa/src/drivers/android_drv.h | 56 +
contrib/wpa/src/drivers/driver.h | 716 +-
contrib/wpa/src/drivers/driver_atheros.c | 41 +-
contrib/wpa/src/drivers/driver_bsd.c | 659 +-
contrib/wpa/src/drivers/driver_common.c | 21 +
contrib/wpa/src/drivers/driver_hostap.c | 24 +-
contrib/wpa/src/drivers/driver_hostap.h | 210 +
contrib/wpa/src/drivers/driver_macsec_linux.c | 87 +-
contrib/wpa/src/drivers/driver_macsec_qca.c | 34 +-
contrib/wpa/src/drivers/driver_ndis.c | 47 +-
contrib/wpa/src/drivers/driver_nl80211.c | 12229 +++++++++++++++++++
contrib/wpa/src/drivers/driver_nl80211.h | 65 +-
contrib/wpa/src/drivers/driver_nl80211_android.c | 4 +-
contrib/wpa/src/drivers/driver_nl80211_capa.c | 579 +-
contrib/wpa/src/drivers/driver_nl80211_event.c | 580 +-
contrib/wpa/src/drivers/driver_nl80211_monitor.c | 3 +
contrib/wpa/src/drivers/driver_nl80211_scan.c | 51 +-
contrib/wpa/src/drivers/driver_none.c | 77 +
contrib/wpa/src/drivers/driver_openbsd.c | 10 +-
contrib/wpa/src/drivers/driver_privsep.c | 18 +-
contrib/wpa/src/drivers/driver_roboswitch.c | 487 +
contrib/wpa/src/drivers/driver_wext.c | 2499 ++++
contrib/wpa/src/drivers/driver_wext.h | 77 +
contrib/wpa/src/drivers/drivers.mak | 220 +
contrib/wpa/src/drivers/drivers.mk | 196 +
contrib/wpa/src/drivers/linux_ioctl.c | 237 +
contrib/wpa/src/drivers/linux_ioctl.h | 23 +
contrib/wpa/src/drivers/linux_wext.h | 45 +
contrib/wpa/src/drivers/netlink.c | 226 +
contrib/wpa/src/drivers/netlink.h | 28 +
contrib/wpa/src/drivers/nl80211_copy.h | 973 +-
contrib/wpa/src/drivers/priv_netlink.h | 109 +
contrib/wpa/src/drivers/rfkill.c | 224 +
contrib/wpa/src/drivers/rfkill.h | 25 +
contrib/wpa/src/eap_common/Makefile | 18 +
contrib/wpa/src/eap_common/eap_common.c | 8 +-
contrib/wpa/src/eap_common/eap_common.h | 8 +-
contrib/wpa/src/eap_common/eap_defs.h | 4 +-
contrib/wpa/src/eap_common/eap_sim_common.c | 28 +
contrib/wpa/src/eap_common/eap_teap_common.c | 72 +-
contrib/wpa/src/eap_common/eap_teap_common.h | 22 +-
contrib/wpa/src/eap_peer/Makefile | 7 +
contrib/wpa/src/eap_peer/eap.c | 220 +-
contrib/wpa/src/eap_peer/eap.h | 13 +-
contrib/wpa/src/eap_peer/eap_aka.c | 48 +-
contrib/wpa/src/eap_peer/eap_config.h | 408 +-
contrib/wpa/src/eap_peer/eap_eke.c | 16 +-
contrib/wpa/src/eap_peer/eap_fast.c | 54 +-
contrib/wpa/src/eap_peer/eap_gpsk.c | 14 +-
contrib/wpa/src/eap_peer/eap_gtc.c | 8 +-
contrib/wpa/src/eap_peer/eap_i.h | 42 +-
contrib/wpa/src/eap_peer/eap_ikev2.c | 28 +-
contrib/wpa/src/eap_peer/eap_leap.c | 44 +-
contrib/wpa/src/eap_peer/eap_md5.c | 12 +-
contrib/wpa/src/eap_peer/eap_methods.c | 12 +-
contrib/wpa/src/eap_peer/eap_methods.h | 14 +-
contrib/wpa/src/eap_peer/eap_mschapv2.c | 32 +-
contrib/wpa/src/eap_peer/eap_otp.c | 8 +-
contrib/wpa/src/eap_peer/eap_pax.c | 50 +-
contrib/wpa/src/eap_peer/eap_peap.c | 71 +-
contrib/wpa/src/eap_peer/eap_psk.c | 22 +-
contrib/wpa/src/eap_peer/eap_pwd.c | 22 +-
contrib/wpa/src/eap_peer/eap_sake.c | 26 +-
contrib/wpa/src/eap_peer/eap_sim.c | 44 +-
contrib/wpa/src/eap_peer/eap_teap.c | 201 +-
contrib/wpa/src/eap_peer/eap_tls.c | 42 +-
contrib/wpa/src/eap_peer/eap_tls_common.c | 103 +-
contrib/wpa/src/eap_peer/eap_tls_common.h | 10 +-
contrib/wpa/src/eap_peer/eap_tnc.c | 32 +-
contrib/wpa/src/eap_peer/eap_ttls.c | 88 +-
contrib/wpa/src/eap_peer/eap_vendor_test.c | 16 +-
contrib/wpa/src/eap_peer/eap_wsc.c | 24 +-
contrib/wpa/src/eap_peer/ikev2.c | 10 +-
contrib/wpa/src/eap_peer/tncc.c | 5 +-
contrib/wpa/src/eap_server/Makefile | 8 +
contrib/wpa/src/eap_server/eap.h | 172 +-
contrib/wpa/src/eap_server/eap_i.h | 67 +-
contrib/wpa/src/eap_server/eap_methods.h | 9 +-
contrib/wpa/src/eap_server/eap_server.c | 291 +-
contrib/wpa/src/eap_server/eap_server_aka.c | 74 +-
contrib/wpa/src/eap_server/eap_server_eke.c | 39 +-
contrib/wpa/src/eap_server/eap_server_fast.c | 106 +-
contrib/wpa/src/eap_server/eap_server_gpsk.c | 37 +-
contrib/wpa/src/eap_server/eap_server_gtc.c | 12 +-
contrib/wpa/src/eap_server/eap_server_identity.c | 14 +-
contrib/wpa/src/eap_server/eap_server_ikev2.c | 22 +-
contrib/wpa/src/eap_server/eap_server_md5.c | 14 +-
contrib/wpa/src/eap_server/eap_server_methods.c | 10 +-
contrib/wpa/src/eap_server/eap_server_mschapv2.c | 22 +-
contrib/wpa/src/eap_server/eap_server_pax.c | 32 +-
contrib/wpa/src/eap_server/eap_server_peap.c | 103 +-
contrib/wpa/src/eap_server/eap_server_psk.c | 34 +-
contrib/wpa/src/eap_server/eap_server_pwd.c | 22 +-
contrib/wpa/src/eap_server/eap_server_sake.c | 38 +-
contrib/wpa/src/eap_server/eap_server_sim.c | 66 +-
contrib/wpa/src/eap_server/eap_server_teap.c | 309 +-
contrib/wpa/src/eap_server/eap_server_tls.c | 54 +-
contrib/wpa/src/eap_server/eap_server_tls_common.c | 93 +-
contrib/wpa/src/eap_server/eap_server_tnc.c | 26 +-
contrib/wpa/src/eap_server/eap_server_ttls.c | 96 +-
.../wpa/src/eap_server/eap_server_vendor_test.c | 12 +-
contrib/wpa/src/eap_server/eap_server_wsc.c | 32 +-
contrib/wpa/src/eap_server/eap_tls_common.h | 2 +-
contrib/wpa/src/eap_server/tncs.c | 5 +-
contrib/wpa/src/eapol_auth/Makefile | 2 +
contrib/wpa/src/eapol_auth/eapol_auth_sm.c | 206 +-
contrib/wpa/src/eapol_auth/eapol_auth_sm.h | 26 +-
contrib/wpa/src/eapol_auth/eapol_auth_sm_i.h | 40 +-
contrib/wpa/src/eapol_supp/Makefile | 5 +
contrib/wpa/src/eapol_supp/eapol_supp_sm.c | 218 +-
contrib/wpa/src/eapol_supp/eapol_supp_sm.h | 29 +-
contrib/wpa/src/fst/fst.c | 25 +-
contrib/wpa/src/fst/fst.h | 23 +-
contrib/wpa/src/fst/fst_ctrl_aux.h | 4 +-
contrib/wpa/src/fst/fst_ctrl_iface.c | 48 +-
contrib/wpa/src/fst/fst_ctrl_iface.h | 2 +-
contrib/wpa/src/fst/fst_group.c | 10 +-
contrib/wpa/src/fst/fst_group.h | 4 +-
contrib/wpa/src/fst/fst_iface.c | 8 +-
contrib/wpa/src/fst/fst_iface.h | 8 +-
contrib/wpa/src/fst/fst_session.c | 96 +-
contrib/wpa/src/fst/fst_session.h | 12 +-
contrib/wpa/src/l2_packet/Makefile | 3 +
contrib/wpa/src/l2_packet/l2_packet.h | 4 +
contrib/wpa/src/l2_packet/l2_packet_freebsd.c | 5 +-
contrib/wpa/src/l2_packet/l2_packet_linux.c | 515 +
contrib/wpa/src/l2_packet/l2_packet_ndis.c | 3 +-
contrib/wpa/src/l2_packet/l2_packet_none.c | 4 +-
contrib/wpa/src/l2_packet/l2_packet_pcap.c | 400 +
contrib/wpa/src/l2_packet/l2_packet_privsep.c | 3 +-
contrib/wpa/src/l2_packet/l2_packet_winpcap.c | 350 +
contrib/wpa/src/lib.rules | 29 +
contrib/wpa/src/objs.mk | 3 +
contrib/wpa/src/p2p/Makefile | 16 +
contrib/wpa/src/p2p/p2p.c | 147 +-
contrib/wpa/src/p2p/p2p.h | 31 +-
contrib/wpa/src/p2p/p2p_go_neg.c | 9 +
contrib/wpa/src/p2p/p2p_i.h | 5 +
contrib/wpa/src/p2p/p2p_invitation.c | 5 +-
contrib/wpa/src/p2p/p2p_utils.c | 39 +
contrib/wpa/src/pae/ieee802_1x_cp.c | 177 +-
contrib/wpa/src/pae/ieee802_1x_cp.h | 10 +-
contrib/wpa/src/pae/ieee802_1x_kay.c | 608 +-
contrib/wpa/src/pae/ieee802_1x_kay.h | 68 +-
contrib/wpa/src/pae/ieee802_1x_kay_i.h | 40 +-
contrib/wpa/src/pae/ieee802_1x_secy_ops.c | 22 +-
contrib/wpa/src/pae/ieee802_1x_secy_ops.h | 8 +-
contrib/wpa/src/radius/Makefile | 9 +
contrib/wpa/src/radius/radius.c | 2 +-
contrib/wpa/src/radius/radius.h | 3 +
contrib/wpa/src/radius/radius_client.c | 55 +-
contrib/wpa/src/radius/radius_client.h | 5 +
contrib/wpa/src/radius/radius_server.c | 283 +-
contrib/wpa/src/radius/radius_server.h | 142 +-
contrib/wpa/src/rsn_supp/Makefile | 14 +
contrib/wpa/src/rsn_supp/pmksa_cache.c | 54 +-
contrib/wpa/src/rsn_supp/pmksa_cache.h | 7 +-
contrib/wpa/src/rsn_supp/preauth.c | 24 +-
contrib/wpa/src/rsn_supp/tdls.c | 71 +-
contrib/wpa/src/rsn_supp/wpa.c | 759 +-
contrib/wpa/src/rsn_supp/wpa.h | 93 +-
contrib/wpa/src/rsn_supp/wpa_ft.c | 399 +-
contrib/wpa/src/rsn_supp/wpa_i.h | 88 +-
contrib/wpa/src/rsn_supp/wpa_ie.c | 317 +-
contrib/wpa/src/rsn_supp/wpa_ie.h | 52 +-
contrib/wpa/src/tls/Makefile | 25 +
contrib/wpa/src/tls/asn1.c | 396 +-
contrib/wpa/src/tls/asn1.h | 146 +-
contrib/wpa/src/tls/pkcs1.c | 55 +-
contrib/wpa/src/tls/pkcs5.c | 78 +-
contrib/wpa/src/tls/pkcs8.c | 59 +-
contrib/wpa/src/tls/rsa.c | 23 +-
contrib/wpa/src/tls/tlsv1_client.c | 29 +-
contrib/wpa/src/tls/tlsv1_client_i.h | 4 +-
contrib/wpa/src/tls/tlsv1_client_ocsp.c | 180 +-
contrib/wpa/src/tls/tlsv1_client_read.c | 10 +-
contrib/wpa/src/tls/tlsv1_client_write.c | 18 +-
contrib/wpa/src/tls/tlsv1_cred.c | 247 +-
contrib/wpa/src/tls/x509v3.c | 419 +-
contrib/wpa/src/tls/x509v3.h | 7 +
contrib/wpa/src/utils/Makefile | 30 +
contrib/wpa/src/utils/base64.c | 59 +-
contrib/wpa/src/utils/base64.h | 13 +-
contrib/wpa/src/utils/browser-android.c | 2 +-
contrib/wpa/src/utils/browser-system.c | 2 +-
contrib/wpa/src/utils/browser-wpadebug.c | 2 +-
contrib/wpa/src/utils/browser.c | 210 +-
contrib/wpa/src/utils/browser.h | 4 +-
contrib/wpa/src/utils/build_config.h | 4 +-
contrib/wpa/src/utils/common.c | 38 +-
contrib/wpa/src/utils/common.h | 8 +-
contrib/wpa/src/utils/config.c | 97 +
contrib/wpa/src/utils/config.h | 29 +
contrib/wpa/src/utils/eloop.c | 47 +-
contrib/wpa/src/utils/eloop_win.c | 8 +-
contrib/wpa/src/utils/ext_password.c | 3 +
contrib/wpa/src/utils/ext_password_file.c | 136 +
contrib/wpa/src/utils/ext_password_i.h | 4 +
contrib/wpa/src/utils/http-utils.h | 6 +-
contrib/wpa/src/utils/includes.h | 1 +
contrib/wpa/src/utils/json.c | 122 +-
contrib/wpa/src/utils/json.h | 15 +
contrib/wpa/src/utils/list.h | 8 +-
contrib/wpa/src/utils/os_internal.c | 6 +
contrib/wpa/src/utils/os_unix.c | 46 +-
contrib/wpa/src/utils/platform.h | 23 +-
contrib/wpa/src/utils/radiotap.c | 12 +-
contrib/wpa/src/utils/radiotap.h | 407 +-
contrib/wpa/src/utils/state_machine.h | 8 +-
contrib/wpa/src/utils/trace.c | 11 +
contrib/wpa/src/utils/utils_module_tests.c | 39 +-
contrib/wpa/src/utils/wpa_debug.c | 147 +-
contrib/wpa/src/utils/wpa_debug.h | 3 -
contrib/wpa/src/utils/wpabuf.h | 27 +
contrib/wpa/src/utils/xml_libxml2.c | 2 +-
contrib/wpa/src/wps/Makefile | 28 +
contrib/wpa/src/wps/upnp_xml.c | 2 +-
contrib/wpa/src/wps/wps.h | 23 +-
contrib/wpa/src/wps/wps_attr_build.c | 15 +-
contrib/wpa/src/wps/wps_attr_process.c | 9 +-
contrib/wpa/src/wps/wps_dev_attr.c | 17 +
contrib/wpa/src/wps/wps_dev_attr.h | 1 +
contrib/wpa/src/wps/wps_enrollee.c | 11 +
contrib/wpa/src/wps/wps_er.c | 4 +-
contrib/wpa/src/wps/wps_registrar.c | 139 +-
contrib/wpa/src/wps/wps_upnp.c | 28 +-
contrib/wpa/src/wps/wps_upnp_ap.c | 4 +-
contrib/wpa/src/wps/wps_upnp_event.c | 27 +-
contrib/wpa/src/wps/wps_upnp_i.h | 9 +-
contrib/wpa/src/wps/wps_upnp_web.c | 4 +-
contrib/wpa/wpa_supplicant/Android.mk | 114 +-
contrib/wpa/wpa_supplicant/ChangeLog | 10 +-
contrib/wpa/wpa_supplicant/Makefile | 2073 ++++
contrib/wpa/wpa_supplicant/README | 4 +-
contrib/wpa/wpa_supplicant/README-DPP | 71 +-
contrib/wpa/wpa_supplicant/README-HS20 | 2 +-
contrib/wpa/wpa_supplicant/android.config | 16 +-
contrib/wpa/wpa_supplicant/ap.c | 257 +-
contrib/wpa/wpa_supplicant/binder/binder.h | 2 +-
contrib/wpa/wpa_supplicant/bss.c | 145 +-
contrib/wpa/wpa_supplicant/bss.h | 25 +-
contrib/wpa/wpa_supplicant/bssid_ignore.c | 221 +
contrib/wpa/wpa_supplicant/bssid_ignore.h | 33 +
contrib/wpa/wpa_supplicant/config.c | 644 +-
contrib/wpa/wpa_supplicant/config.h | 129 +-
contrib/wpa/wpa_supplicant/config_file.c | 243 +-
contrib/wpa/wpa_supplicant/config_ssid.h | 155 +-
contrib/wpa/wpa_supplicant/config_winreg.c | 1061 ++
contrib/wpa/wpa_supplicant/ctrl_iface.c | 1375 ++-
contrib/wpa/wpa_supplicant/ctrl_iface.h | 16 +-
contrib/wpa/wpa_supplicant/ctrl_iface_named_pipe.c | 7 +-
contrib/wpa/wpa_supplicant/ctrl_iface_udp.c | 63 +-
contrib/wpa/wpa_supplicant/ctrl_iface_unix.c | 73 +-
contrib/wpa/wpa_supplicant/dbus/dbus_common.c | 23 +-
contrib/wpa/wpa_supplicant/dbus/dbus_new.c | 76 +-
.../wpa/wpa_supplicant/dbus/dbus_new_handlers.c | 424 +-
.../wpa/wpa_supplicant/dbus/dbus_new_handlers.h | 6 +
.../wpa_supplicant/dbus/dbus_new_handlers_p2p.c | 84 +-
.../wpa/wpa_supplicant/dbus/dbus_new_introspect.c | 2 +-
contrib/wpa/wpa_supplicant/defconfig | 45 +-
contrib/wpa/wpa_supplicant/doc/docbook/Makefile | 28 +
.../wpa/wpa_supplicant/doc/docbook/eapol_test.sgml | 209 +
.../wpa_supplicant/doc/docbook/wpa_background.sgml | 105 +
.../wpa/wpa_supplicant/doc/docbook/wpa_cli.sgml | 360 +
.../wpa/wpa_supplicant/doc/docbook/wpa_gui.sgml | 106 +
.../wpa_supplicant/doc/docbook/wpa_passphrase.sgml | 77 +
.../wpa/wpa_supplicant/doc/docbook/wpa_priv.sgml | 152 +
.../doc/docbook/wpa_supplicant.conf.sgml | 243 +
.../wpa_supplicant/doc/docbook/wpa_supplicant.sgml | 764 ++
contrib/wpa/wpa_supplicant/dpp_supplicant.c | 1808 ++-
contrib/wpa/wpa_supplicant/dpp_supplicant.h | 15 +
contrib/wpa/wpa_supplicant/driver_i.h | 109 +-
contrib/wpa/wpa_supplicant/eapol_test.c | 15 +-
contrib/wpa/wpa_supplicant/events.c | 1537 ++-
contrib/wpa/wpa_supplicant/examples/dpp-nfc.py | 1186 ++
.../wpa_supplicant/examples/p2p-action-udhcp.sh | 4 +-
contrib/wpa/wpa_supplicant/examples/p2p-action.sh | 4 +-
.../wpa/wpa_supplicant/examples/p2p/p2p_connect.py | 18 +-
.../wpa_supplicant/examples/p2p/p2p_disconnect.py | 2 +-
.../wpa/wpa_supplicant/examples/p2p/p2p_find.py | 2 +-
.../wpa/wpa_supplicant/examples/p2p/p2p_flush.py | 2 +-
.../wpa_supplicant/examples/p2p/p2p_group_add.py | 14 +-
.../wpa/wpa_supplicant/examples/p2p/p2p_invite.py | 10 +-
.../wpa/wpa_supplicant/examples/p2p/p2p_listen.py | 2 +-
.../wpa_supplicant/examples/p2p/p2p_stop_find.py | 2 +-
.../wpa/wpa_supplicant/examples/udhcpd-p2p.conf | 12 +-
contrib/wpa/wpa_supplicant/gas_query.c | 62 +-
contrib/wpa/wpa_supplicant/gas_query.h | 2 +-
contrib/wpa/wpa_supplicant/hs20_supplicant.c | 30 +-
contrib/wpa/wpa_supplicant/ibss_rsn.c | 45 +-
contrib/wpa/wpa_supplicant/interworking.c | 66 +-
contrib/wpa/wpa_supplicant/interworking.h | 2 +-
contrib/wpa/wpa_supplicant/main.c | 10 +-
contrib/wpa/wpa_supplicant/main_winmain.c | 78 +
contrib/wpa/wpa_supplicant/main_winsvc.c | 458 +
contrib/wpa/wpa_supplicant/mbo.c | 30 +
contrib/wpa/wpa_supplicant/mesh.c | 243 +-
contrib/wpa/wpa_supplicant/mesh.h | 6 +-
contrib/wpa/wpa_supplicant/mesh_mpm.c | 49 +-
contrib/wpa/wpa_supplicant/mesh_rsn.c | 27 +-
contrib/wpa/wpa_supplicant/nmake.mak | 2 +-
contrib/wpa/wpa_supplicant/notify.c | 10 +-
contrib/wpa/wpa_supplicant/offchannel.c | 6 +-
contrib/wpa/wpa_supplicant/op_classes.c | 239 +-
contrib/wpa/wpa_supplicant/p2p_supplicant.c | 667 +-
contrib/wpa/wpa_supplicant/p2p_supplicant.h | 32 +-
contrib/wpa/wpa_supplicant/pasn_supplicant.c | 1714 +++
contrib/wpa/wpa_supplicant/preauth_test.c | 20 +-
contrib/wpa/wpa_supplicant/robust_av.c | 155 +
contrib/wpa/wpa_supplicant/rrm.c | 91 +-
contrib/wpa/wpa_supplicant/scan.c | 703 +-
contrib/wpa/wpa_supplicant/scan.h | 33 +
contrib/wpa/wpa_supplicant/sme.c | 531 +-
contrib/wpa/wpa_supplicant/sme.h | 8 +-
.../systemd/wpa_supplicant-nl80211.service.arg.in | 2 +-
.../systemd/wpa_supplicant-wired.service.arg.in | 2 +-
.../systemd/wpa_supplicant.service.arg.in | 2 +-
contrib/wpa/wpa_supplicant/twt.c | 142 +
.../vs2005/eapol_test/eapol_test.vcproj | 6 +-
.../vs2005/wpa_supplicant/wpa_supplicant.vcproj | 6 +-
.../wpa/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj | 6 +-
contrib/wpa/wpa_supplicant/wmm_ac.c | 2 +-
contrib/wpa/wpa_supplicant/wnm_sta.c | 33 +-
contrib/wpa/wpa_supplicant/wpa_cli.c | 339 +-
contrib/wpa/wpa_supplicant/wpa_passphrase.c | 8 +-
contrib/wpa/wpa_supplicant/wpa_priv.c | 32 +-
contrib/wpa/wpa_supplicant/wpa_supplicant.c | 1283 +-
contrib/wpa/wpa_supplicant/wpa_supplicant.conf | 196 +-
contrib/wpa/wpa_supplicant/wpa_supplicant_i.h | 249 +-
contrib/wpa/wpa_supplicant/wpas_glue.c | 222 +-
contrib/wpa/wpa_supplicant/wpas_glue.h | 2 +
contrib/wpa/wpa_supplicant/wpas_kay.c | 12 +-
contrib/wpa/wpa_supplicant/wpas_module_tests.c | 85 +-
contrib/wpa/wpa_supplicant/wps_supplicant.c | 85 +-
contrib/wpa/wpa_supplicant/wps_supplicant.h | 5 +
usr.sbin/wpa/Makefile.crypto | 1 +
usr.sbin/wpa/Makefile.inc | 5 +-
usr.sbin/wpa/hostapd/Makefile | 2 -
usr.sbin/wpa/src/ap/Makefile | 9 +-
usr.sbin/wpa/src/common/Makefile | 3 +
usr.sbin/wpa/src/crypto/Makefile | 5 +-
usr.sbin/wpa/src/rsn_supp/Makefile | 4 -
usr.sbin/wpa/src/utils/Makefile | 2 +
usr.sbin/wpa/wpa_supplicant/Makefile | 7 +-
504 files changed, 92633 insertions(+), 20540 deletions(-)
diff --cc contrib/wpa/hostapd/Android.mk
index 000000000000,dd8aa2450d7e..dd8aa2450d7e
mode 000000,100644..100644
--- a/contrib/wpa/hostapd/Android.mk
+++ b/contrib/wpa/hostapd/Android.mk
diff --cc contrib/wpa/hostapd/Makefile
index 000000000000,ac085fd10520..ac085fd10520
mode 000000,100644..100644
--- a/contrib/wpa/hostapd/Makefile
+++ b/contrib/wpa/hostapd/Makefile
diff --cc contrib/wpa/hostapd/android.config
index 000000000000,c8b3afabef8d..c8b3afabef8d
mode 000000,100644..100644
--- a/contrib/wpa/hostapd/android.config
+++ b/contrib/wpa/hostapd/android.config
diff --cc contrib/wpa/hostapd/hostapd.android.rc
index 000000000000,26a87b808914..26a87b808914
mode 000000,100644..100644
--- a/contrib/wpa/hostapd/hostapd.android.rc
+++ b/contrib/wpa/hostapd/hostapd.android.rc
diff --cc contrib/wpa/hostapd/sae_pk_gen.c
index 000000000000,c31eff75b538..c31eff75b538
mode 000000,100644..100644
--- a/contrib/wpa/hostapd/sae_pk_gen.c
+++ b/contrib/wpa/hostapd/sae_pk_gen.c
diff --cc contrib/wpa/hs20/server/Makefile
index 000000000000,0cab6d6b010a..0cab6d6b010a
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/Makefile
+++ b/contrib/wpa/hs20/server/Makefile
diff --cc contrib/wpa/hs20/server/ca/clean.sh
index 000000000000,c72dcbda45e9..c72dcbda45e9
mode 000000,100755..100755
--- a/contrib/wpa/hs20/server/ca/clean.sh
+++ b/contrib/wpa/hs20/server/ca/clean.sh
diff --cc contrib/wpa/hs20/server/ca/est-csrattrs.cnf
index 000000000000,b50ea00d0b77..b50ea00d0b77
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/ca/est-csrattrs.cnf
+++ b/contrib/wpa/hs20/server/ca/est-csrattrs.cnf
diff --cc contrib/wpa/hs20/server/ca/est-csrattrs.sh
index 000000000000,0b73a0408284..0b73a0408284
mode 000000,100755..100755
--- a/contrib/wpa/hs20/server/ca/est-csrattrs.sh
+++ b/contrib/wpa/hs20/server/ca/est-csrattrs.sh
diff --cc contrib/wpa/hs20/server/ca/hs20.oid
index 000000000000,a829ff29bf44..a829ff29bf44
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/ca/hs20.oid
+++ b/contrib/wpa/hs20/server/ca/hs20.oid
diff --cc contrib/wpa/hs20/server/ca/ocsp-req.sh
index 000000000000,931a20696d02..931a20696d02
mode 000000,100755..100755
--- a/contrib/wpa/hs20/server/ca/ocsp-req.sh
+++ b/contrib/wpa/hs20/server/ca/ocsp-req.sh
diff --cc contrib/wpa/hs20/server/ca/ocsp-responder-ica.sh
index 000000000000,116c6e1c3d01..116c6e1c3d01
mode 000000,100755..100755
--- a/contrib/wpa/hs20/server/ca/ocsp-responder-ica.sh
+++ b/contrib/wpa/hs20/server/ca/ocsp-responder-ica.sh
diff --cc contrib/wpa/hs20/server/ca/ocsp-responder.sh
index 000000000000,620947d01af0..620947d01af0
mode 000000,100755..100755
--- a/contrib/wpa/hs20/server/ca/ocsp-responder.sh
+++ b/contrib/wpa/hs20/server/ca/ocsp-responder.sh
diff --cc contrib/wpa/hs20/server/ca/ocsp-update-cache.sh
index 000000000000,f2b23250cadd..f2b23250cadd
mode 000000,100755..100755
--- a/contrib/wpa/hs20/server/ca/ocsp-update-cache.sh
+++ b/contrib/wpa/hs20/server/ca/ocsp-update-cache.sh
diff --cc contrib/wpa/hs20/server/ca/openssl-root.cnf
index 000000000000,5bc50be1dbc9..5bc50be1dbc9
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/ca/openssl-root.cnf
+++ b/contrib/wpa/hs20/server/ca/openssl-root.cnf
diff --cc contrib/wpa/hs20/server/ca/openssl.cnf
index 000000000000,61410138340f..61410138340f
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/ca/openssl.cnf
+++ b/contrib/wpa/hs20/server/ca/openssl.cnf
diff --cc contrib/wpa/hs20/server/ca/setup.sh
index 000000000000,78abcccff455..78abcccff455
mode 000000,100755..100755
--- a/contrib/wpa/hs20/server/ca/setup.sh
+++ b/contrib/wpa/hs20/server/ca/setup.sh
diff --cc contrib/wpa/hs20/server/ca/w1fi_logo.png
index 000000000000,ac7c259fff2e..ac7c259fff2e
mode 000000,100644..100644
Binary files differ
diff --cc contrib/wpa/hs20/server/hs20-osu-server.txt
index 000000000000,22478ad9d2cb..22478ad9d2cb
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/hs20-osu-server.txt
+++ b/contrib/wpa/hs20/server/hs20-osu-server.txt
diff --cc contrib/wpa/hs20/server/hs20_spp_server.c
index 000000000000,347c40a73d6a..347c40a73d6a
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/hs20_spp_server.c
+++ b/contrib/wpa/hs20/server/hs20_spp_server.c
diff --cc contrib/wpa/hs20/server/spp_server.c
index 000000000000,a50e9074f7b4..a50e9074f7b4
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/spp_server.c
+++ b/contrib/wpa/hs20/server/spp_server.c
diff --cc contrib/wpa/hs20/server/spp_server.h
index 000000000000,421974c607b8..421974c607b8
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/spp_server.h
+++ b/contrib/wpa/hs20/server/spp_server.h
diff --cc contrib/wpa/hs20/server/sql-example.txt
index 000000000000,20dcf2f5c688..20dcf2f5c688
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/sql-example.txt
+++ b/contrib/wpa/hs20/server/sql-example.txt
diff --cc contrib/wpa/hs20/server/sql.txt
index 000000000000,2cc6edea4063..2cc6edea4063
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/sql.txt
+++ b/contrib/wpa/hs20/server/sql.txt
diff --cc contrib/wpa/hs20/server/www/add-free.php
index 000000000000,1efc65563274..1efc65563274
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/add-free.php
+++ b/contrib/wpa/hs20/server/www/add-free.php
diff --cc contrib/wpa/hs20/server/www/add-mo.php
index 000000000000,a3b4513531f8..a3b4513531f8
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/add-mo.php
+++ b/contrib/wpa/hs20/server/www/add-mo.php
diff --cc contrib/wpa/hs20/server/www/cert-enroll.php
index 000000000000,f023ca5a5b03..f023ca5a5b03
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/cert-enroll.php
+++ b/contrib/wpa/hs20/server/www/cert-enroll.php
diff --cc contrib/wpa/hs20/server/www/config.php
index 000000000000,4272b102a88c..4272b102a88c
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/config.php
+++ b/contrib/wpa/hs20/server/www/config.php
diff --cc contrib/wpa/hs20/server/www/est.php
index 000000000000,b7fb260d56c4..b7fb260d56c4
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/est.php
+++ b/contrib/wpa/hs20/server/www/est.php
diff --cc contrib/wpa/hs20/server/www/free-remediation.php
index 000000000000,5648b30e8d6b..5648b30e8d6b
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/free-remediation.php
+++ b/contrib/wpa/hs20/server/www/free-remediation.php
diff --cc contrib/wpa/hs20/server/www/free.php
index 000000000000,8195069ed8ff..8195069ed8ff
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/free.php
+++ b/contrib/wpa/hs20/server/www/free.php
diff --cc contrib/wpa/hs20/server/www/redirect.php
index 000000000000,8fc9cd644273..8fc9cd644273
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/redirect.php
+++ b/contrib/wpa/hs20/server/www/redirect.php
diff --cc contrib/wpa/hs20/server/www/remediation-pw.php
index 000000000000,76fdccbdf9f7..76fdccbdf9f7
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/remediation-pw.php
+++ b/contrib/wpa/hs20/server/www/remediation-pw.php
diff --cc contrib/wpa/hs20/server/www/remediation.php
index 000000000000,3628065ac225..3628065ac225
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/remediation.php
+++ b/contrib/wpa/hs20/server/www/remediation.php
diff --cc contrib/wpa/hs20/server/www/signup.php
index 000000000000,80a9d403e8fc..80a9d403e8fc
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/signup.php
+++ b/contrib/wpa/hs20/server/www/signup.php
diff --cc contrib/wpa/hs20/server/www/spp.php
index 000000000000,c56d3d69e0ed..c56d3d69e0ed
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/spp.php
+++ b/contrib/wpa/hs20/server/www/spp.php
diff --cc contrib/wpa/hs20/server/www/terms.php
index 000000000000,acba23ef1ad7..acba23ef1ad7
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/terms.php
+++ b/contrib/wpa/hs20/server/www/terms.php
diff --cc contrib/wpa/hs20/server/www/users.php
index 000000000000,2bd555275dda..2bd555275dda
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/users.php
+++ b/contrib/wpa/hs20/server/www/users.php
diff --cc contrib/wpa/src/Makefile
index 000000000000,6eb7f2acb5a1..6eb7f2acb5a1
mode 000000,100644..100644
--- a/contrib/wpa/src/Makefile
+++ b/contrib/wpa/src/Makefile
diff --cc contrib/wpa/src/ap/Makefile
index 000000000000,a1e9b7c44d2f..a1e9b7c44d2f
mode 000000,100644..100644
--- a/contrib/wpa/src/ap/Makefile
+++ b/contrib/wpa/src/ap/Makefile
diff --cc contrib/wpa/src/build.rules
index 000000000000,acda8847284d..acda8847284d
mode 000000,100644..100644
--- a/contrib/wpa/src/build.rules
+++ b/contrib/wpa/src/build.rules
diff --cc contrib/wpa/src/common/Makefile
index 000000000000,e2c5f03c2c3b..e2c5f03c2c3b
mode 000000,100644..100644
--- a/contrib/wpa/src/common/Makefile
+++ b/contrib/wpa/src/common/Makefile
diff --cc contrib/wpa/src/common/brcm_vendor.h
index 000000000000,f163dea73768..f163dea73768
mode 000000,100644..100644
--- a/contrib/wpa/src/common/brcm_vendor.h
+++ b/contrib/wpa/src/common/brcm_vendor.h
diff --cc contrib/wpa/src/common/dhcp.h
index ff52483b12eb,000000000000..c7f0617dd928
mode 100644,000000..100644
--- a/contrib/wpa/src/common/dhcp.h
+++ b/contrib/wpa/src/common/dhcp.h
@@@ -1,281 -1,0 +1,281 @@@
+/*
+ * DHCP definitions
+ * Copyright (c) 2014-2017, Qualcomm Atheros, Inc.
+ *
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
+ */
+
+#ifndef DHCP_H
+#define DHCP_H
+
+#if defined(__FreeBSD__)
+/*
+ * Translate Linux to FreeBSD
+ */
+#define iphdr ip
+#define ihl ip_hl
+#define verson ip_v
+#define tos ip_tos
+#define tot_len ip_len
+#define id ip_id
+#define frag_off ip_off
+#define ttl ip_ttl
+#define protocol ip_p
+#define check ip_sum
+#define saddr ip_src
+#define daddr ip_dst
+#endif
+
+#include <netinet/ip.h>
+#if __FAVOR_BSD
+#include <netinet/udp.h>
+#else
+#define __FAVOR_BSD 1
+#include <netinet/udp.h>
+#undef __FAVOR_BSD
+#endif
+
+#define DHCP_SERVER_PORT 67
+#define DHCP_CLIENT_PORT 68
+
+struct dhcp_data {
+ u8 op;
+ u8 htype;
+ u8 hlen;
+ u8 hops;
+ be32 xid;
+ be16 secs;
+ be16 flags;
+ be32 client_ip;
+ be32 your_ip;
+ be32 server_ip;
+ be32 relay_ip;
+ u8 hw_addr[16];
+ u8 serv_name[64];
+ u8 boot_file[128];
+} STRUCT_PACKED;
+
+struct bootp_pkt {
- struct iphdr iph;
++ struct ip iph;
+ struct udphdr udph;
+ u8 op;
+ u8 htype;
+ u8 hlen;
+ u8 hops;
+ be32 xid;
+ be16 secs;
+ be16 flags;
+ be32 client_ip;
+ be32 your_ip;
+ be32 server_ip;
+ be32 relay_ip;
+ u8 hw_addr[16];
+ u8 serv_name[64];
+ u8 boot_file[128];
+ u8 exten[312];
+} STRUCT_PACKED;
+
+#define DHCP_MAGIC 0x63825363
+
+/*
+ * IANA DHCP/BOOTP registry
+ * http://www.iana.org/assignments/bootp-dhcp-parameters/bootp-dhcp-parameters.xhtml
+*/
+enum dhcp_options {
+ DHCP_OPT_PAD = 0,
+ DHCP_OPT_SUBNET_MASK = 1,
+ DHCP_OPT_TIME_OFFSET = 2,
+ DHCP_OPT_ROUTER = 3,
+ DHCP_OPT_TIME_SERVER = 4,
+ DHCP_OPT_NAME_SERVER = 5,
+ DHCP_OPT_DOMAIN_NAME_SERVER = 6,
+ DHCP_OPT_LOG_SERVER = 7,
+ DHCP_OPT_QUOTES_SERVER = 8,
+ DHCP_OPT_LPR_SERVER = 9,
+ DHCP_OPT_IMPRESS_SERVER = 10,
+ DHCP_OPT_RLP_SERVER = 11,
+ DHCP_OPT_HOSTNAME = 12,
+ DHCP_OPT_BOOT_FILE_SIZE = 13,
+ DHCP_OPT_MERIT_DUMP_FILE = 14,
+ DHCP_OPT_DOMAIN_NAME = 15,
+ DHCP_OPT_SWAP_SERVER = 16,
+ DHCP_OPT_ROOT_PATH = 17,
+ DHCP_OPT_EXTENSION_PATH = 18,
+ DHCP_OPT_FORWARD = 19,
+ DHCP_OPT_SRC_RTE = 20,
+ DHCP_OPT_POLICY_FILTER = 21,
+ DHCP_OPT_MAX_DG_ASSEMBLY = 22,
+ DHCP_OPT_DEFAULT_IP_TTL = 23,
+ DHCP_OPT_MTU_TIMEOUT = 24,
+ DHCP_OPT_MTU_PLATEAU = 25,
+ DHCP_OPT_MTU_INTERFACE = 26,
+ DHCP_OPT_ALL_SUBNETS_LOCAL = 27,
+ DHCP_OPT_BROADCAST_ADDRESS = 28,
+ DHCP_OPT_MASK_DISCOVERY = 29,
+ DHCP_OPT_MASK_SUPPLIER = 30,
+ DHCP_OPT_ROUTER_DISCOVERY = 31,
+ DHCP_OPT_ROUTER_SOLICITATION_ADDRESS = 32,
+ DHCP_OPT_STATIC_ROUTE = 33,
+ DHCP_OPT_TRAILERS = 34,
+ DHCP_OPT_ARP_TIMEOUT = 35,
+ DHCP_OPT_ETHERNET = 36,
+ DHCP_OPT_TCP_DEFAULT_TTL = 37,
+ DHCP_OPT_TCP_KEEPALIVE_INTERVAL = 38,
+ DHCP_OPT_TCP_KEEPALIVE_GARBAGE = 39,
+ DHCP_OPT_NIS_DOMAIN = 40,
+ DHCP_OPT_NIS_SERVERS = 41,
+ DHCP_OPT_NTP_SERVERS = 42,
+ DHCP_OPT_VENDOR_SPECIFIC = 43,
+ DHCP_OPT_NETBIOS_NAME_SERVER = 44,
+ DHCP_OPT_NETBIOS_DISTRIBUTION_SERVER = 45,
+ DHCP_OPT_NETBIOS_NODE_TYPE = 46,
+ DHCP_OPT_NETBIOS_SCOPE = 47,
+ DHCP_OPT_FONT_SERVER = 48,
+ DHCP_OPT_DISPLAY_MANAGER = 49,
+ DHCP_OPT_REQUESTED_IP_ADDRESS = 50,
+ DHCP_OPT_IP_ADDRESS_LEASE_TIME = 51,
+ DHCP_OPT_OVERLOAD = 52,
+ DHCP_OPT_MSG_TYPE = 53,
+ DHCP_OPT_SERVER_ID = 54,
+ DHCP_OPT_PARAMETER_REQ_LIST = 55,
+ DHCP_OPT_MESSAGE = 56,
+ DHCP_OPT_MAX_MESSAGE_SIZE = 57,
+ DHCP_OPT_RENEWAL_TIME = 58,
+ DHCP_OPT_REBINDING_TIME = 59,
+ DHCP_OPT_VENDOR_CLASS_ID = 60,
+ DHCP_OPT_CLIENT_ID = 61,
+ DHCP_OPT_NETWARE_IP_DOMAIN = 62,
+ DHCP_OPT_NETWARE_IP_OPTION = 63,
+ DHCP_OPT_NIS_V3_DOMAIN = 64,
+ DHCP_OPT_NIS_V3_SERVERS = 65,
+ DHCP_OPT_TFTP_SERVER_NAME = 66,
+ DHCP_OPT_BOOT_FILE_NAME = 67,
+ DHCP_OPT_HOME_AGENT_ADDRESSES = 68,
+ DHCP_OPT_SMTP_SERVER = 69,
+ DHCP_OPT_POP3_SERVER = 70,
+ DHCP_OPT_NNTP_SERVER = 71,
+ DHCP_OPT_WWW_SERVER = 72,
+ DHCP_OPT_FINGER_SERVER = 73,
+ DHCP_OPT_IRC_SERVER = 74,
+ DHCP_OPT_STREETTALK_SERVER = 75,
+ DHCP_OPT_STDA_SERVER = 76,
+ DHCP_OPT_USER_CLASS = 77,
+ DHCP_OPT_DIRECTORY_AGENT = 78,
+ DHCP_OPT_SERVICE_SCOPE = 79,
+ DHCP_OPT_RAPID_COMMIT = 80,
+ DHCP_OPT_CLIENT_FQDN = 81,
+ DHCP_OPT_RELAY_AGENT_INFO = 82,
+ DHCP_OPT_ISNS = 83,
+ DHCP_OPT_NDS_SERVERS = 85,
+ DHCP_OPT_NDS_TREE_NAME = 86,
+ DHCP_OPT_NDS_CONTEXT = 87,
+ DHCP_OPT_BCMCS_CONTROLLER_DOMAIN_NAME_LIST = 88,
+ DHCP_OPT_BCMCS_CONTROLLER_IPV4_ADDRESS = 89,
+ DHCP_OPT_AUTHENTICATION = 90,
+ DHCP_OPT_CLIENT_LAST_TRANSACTION_TIME = 91,
+ DHCP_OPT_ASSOCIATED_IP = 92,
+ DHCP_OPT_CLIENT_SYSYEM = 93,
+ DHCP_OPT_CLIENT_NDI = 94,
+ DHCP_OPT_LDAP = 95,
+ DHCP_OPT_UUID_GUID = 97,
+ DHCP_OPT_USER_AUTH = 98,
+ DHCP_OPT_GEOCONF_CIVIC = 99,
+ DHCP_OPT_PCODE = 100,
+ DHCP_OPT_TCODE = 101,
+ DHCP_OPT_NETINFO_ADDRESS = 112,
+ DHCP_OPT_NETINFO_TAG = 113,
+ DHCP_OPT_URL = 114,
+ DHCP_OPT_AUTO_CONFIG = 116,
+ DHCP_OPT_NAME_SERVICE_SEARCH = 117,
+ DHCP_OPT_SUBNET_SELECTION = 118,
+ DHCP_OPT_DOMAIN_SEARCH = 119,
+ DHCP_OPT_SIP_SERVERS_DCP = 120,
+ DHCP_OPT_CLASSLESS_STATIC_ROUTE = 121,
+ DHCP_OPT_CCC = 122,
+ DHCP_OPT_GEOCONF = 123,
+ DHCP_OPT_V_I_VENDOR_CLASS = 124,
+ DHCP_OPT_V_I_VENDOR_SPECIFIC_INFO = 125,
+ DHCP_OPT_PANA_AGENT = 136,
+ DHCP_OPT_V4_LOST = 137,
+ DHCP_OPT_CAPWAP_AC_V4 = 138,
+ DHCP_OPT_IPV4_ADDRESS_MOS = 139,
+ DHCP_OPT_IPV4_FQDN_MOS = 140,
+ DHCP_OPT_SIP_UA_CONF = 141,
+ DHCP_OPT_IPV4_ADDRESS_ANDSF = 142,
+ DHCP_OPT_GEOLOC = 144,
+ DHCP_OPT_FORCERENEW_NONCE_CAPABLE = 145,
+ DHCP_OPT_RDNSS_SELECTION = 146,
+ DHCP_OPT_TFTP_SERVER_ADDRESS = 150,
+ DHCP_OPT_STATUS_CODE = 151,
+ DHCP_OPT_BASE_TIME = 152,
+ DHCP_OPT_START_TIME_OF_STATE = 153,
+ DHCP_OPT_QUERY_START_TIME = 154,
+ DHCP_OPT_QUERY_END_TIME = 155,
+ DHCP_OPT_STATE = 156,
+ DHCP_OPT_DATA_SOURCE = 157,
+ DHCP_OPT_V4_PCP_SERVER = 158,
+ DHCP_OPT_V4_PORTPARAMS = 159,
+ DHCP_OPT_CAPTIVE_PORTAL = 160,
+ DHCP_OPT_CONF_FILE = 209,
+ DHCP_OPT_PATH_PREFIX = 210,
+ DHCP_OPT_REBOOT_TIME = 211,
+ DHCP_OPT_6RD = 212,
+ DHCP_OPT_V4_ACCESS_DOMAIN = 213,
+ DHCP_OPT_SUBNET_ALLOCATION = 220,
+ DHCP_OPT_VSS = 221,
+ DHCP_OPT_END = 255
+};
+
+enum dhcp_message_types {
+ DHCPDISCOVER = 1,
+ DHCPOFFER = 2,
+ DHCPREQUEST = 3,
+ DHCPDECLINE = 4,
+ DHCPACK = 5,
+ DHCPNAK = 6,
+ DHCPRELEASE = 7,
+ DHCPINFORM = 8,
+ DHCPFORCERENEW = 9,
+ DHCPLEASEQUERY = 10,
*** 3725 LINES SKIPPED ***
More information about the dev-commits-src-main
mailing list