X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=32d3167b16e416fc3e699d6c2d00fec42f45e8b3;hb=54c6dc4;hp=aea5b216e40da1eb9532a05ee5833dc260aaf9ad;hpb=f1493140af6ec734c9cd57cfc3d0822207c519c5;p=vpp.git diff --git a/src/vnet.am b/src/vnet.am index aea5b216e40..32d3167b16e 100644 --- a/src/vnet.am +++ b/src/vnet.am @@ -31,8 +31,10 @@ endif # Generic stuff ######################################## libvnet_la_SOURCES += \ + vnet/buffer.c \ vnet/config.c \ vnet/devices/devices.c \ + vnet/devices/netlink.c \ vnet/handoff.c \ vnet/interface.c \ vnet/interface_api.c \ @@ -47,6 +49,7 @@ nobase_include_HEADERS += \ vnet/buffer.h \ vnet/config.h \ vnet/devices/devices.h \ + vnet/devices/netlink.h \ vnet/global_funcs.h \ vnet/handoff.h \ vnet/interface.h \ @@ -60,7 +63,8 @@ nobase_include_HEADERS += \ vnet/vnet.h \ vnet/vnet_all_api_h.h \ vnet/vnet_msg_enum.h \ - vnet/util/radix.h + vnet/util/radix.h \ + vnet/util/refcount.h API_FILES += vnet/interface.api @@ -354,6 +358,7 @@ libvnet_la_SOURCES += \ vnet/ip/ip_input_acl.c \ vnet/ip/lookup.c \ vnet/ip/ping.c \ + vnet/ip/punt_api.c \ vnet/ip/punt.c nobase_include_HEADERS += \ @@ -380,9 +385,12 @@ nobase_include_HEADERS += \ vnet/ip/ports.def \ vnet/ip/protocols.def \ vnet/ip/punt_error.def \ + vnet/ip/punt.api.h \ vnet/ip/punt.h -API_FILES += vnet/ip/ip.api +API_FILES += \ + vnet/ip/ip.api \ + vnet/ip/punt.api ######################################## # Bidirectional Forwarding Detection @@ -420,6 +428,8 @@ libvnet_la_SOURCES += \ vnet/ipsec/esp_format.c \ vnet/ipsec/esp_encrypt.c \ vnet/ipsec/esp_decrypt.c \ + vnet/ipsec/ah_decrypt.c \ + vnet/ipsec/ah_encrypt.c \ vnet/ipsec/ikev2.c \ vnet/ipsec/ikev2_crypto.c \ vnet/ipsec/ikev2_cli.c \ @@ -436,6 +446,7 @@ libvnet_la_SOURCES += \ nobase_include_HEADERS += \ vnet/ipsec/ipsec.h \ vnet/ipsec/esp.h \ + vnet/ipsec/ah.h \ vnet/ipsec/ikev2.h \ vnet/ipsec/ikev2_priv.h \ vnet/ipsec/ipsec.api.h @@ -713,7 +724,7 @@ API_FILES += vnet/lisp-gpe/lisp_gpe.api ######################################## libvnet_la_SOURCES += \ vnet/dhcp/client.c \ - vnet/dhcp/client.h \ + vnet/dhcp/dhcp_client_detect.c \ vnet/dhcp/dhcp_api.c nobase_include_HEADERS += \ @@ -761,11 +772,15 @@ API_FILES += vnet/srv6/sr.api libvnet_la_SOURCES += \ vnet/srmpls/sr_mpls_policy.c \ - vnet/srmpls/sr_mpls_steering.c + vnet/srmpls/sr_mpls_steering.c \ + vnet/srmpls/sr_mpls_api.c nobase_include_HEADERS += \ - vnet/srmpls/sr.h + vnet/srmpls/sr_mpls.h \ + vnet/srmpls/sr_mpls.api.h + +API_FILES += vnet/srmpls/sr_mpls.api ######################################## # IPFIX / netflow v10 @@ -845,35 +860,49 @@ libvnet_la_SOURCES += \ vnet/pg/init.c \ vnet/pg/input.c \ vnet/pg/output.c \ - vnet/pg/stream.c + vnet/pg/stream.c \ + vnet/pg/pg_api.c nobase_include_HEADERS += \ vnet/pg/pg.h \ - vnet/pg/edit.h + vnet/pg/edit.h \ + vnet/pg/pg.api.h + +API_FILES += vnet/pg/pg.api ######################################## # virtio ######################################## -libvnet_la_SOURCES += \ - vnet/devices/virtio/vhost-user.c \ - vnet/devices/virtio/vhost_user_api.c +libvnet_la_SOURCES += \ + vnet/devices/virtio/device.c \ + vnet/devices/virtio/node.c \ + vnet/devices/virtio/vhost-user.c \ + vnet/devices/virtio/vhost_user_api.c \ + vnet/devices/virtio/virtio.c + -nobase_include_HEADERS += \ - vnet/devices/virtio/vhost-user.h \ +nobase_include_HEADERS += \ + vnet/devices/virtio/virtio.h \ + vnet/devices/virtio/vhost-user.h \ vnet/devices/virtio/vhost_user.api.h API_FILES += vnet/devices/virtio/vhost_user.api ######################################## -# ssvm ethernet +# tap interface (with virtio backend) ######################################## -libvnet_la_SOURCES += \ - vnet/devices/ssvm/ssvm_eth.c \ - vnet/devices/ssvm/node.c -nobase_include_HEADERS += \ - vnet/devices/ssvm/ssvm_eth.h +libvnet_la_SOURCES += \ + vnet/devices/tap/cli.c \ + vnet/devices/tap/tap.c \ + vnet/devices/tap/tapv2_api.c + +nobase_include_HEADERS += \ + vnet/devices/tap/tap.h \ + vnet/devices/tap/tapv2.api.h + +API_FILES += vnet/devices/tap/tapv2.api ######################################## # session managmeent @@ -955,10 +984,14 @@ API_FILES += vnet/devices/netmap/netmap.api libvnet_la_SOURCES += \ vnet/feature/feature.c \ + vnet/feature/feature_api.c \ vnet/feature/registration.c nobase_include_HEADERS += \ - vnet/feature/feature.h + vnet/feature/feature.h \ + vnet/feature/feature.api.h + +API_FILES += vnet/feature/feature.api ######################################## # Unix kernel related @@ -1071,7 +1104,7 @@ libvnet_la_SOURCES += \ vnet/dpo/mpls_disposition.c \ vnet/dpo/mpls_label_dpo.c \ vnet/dpo/l3_proxy_dpo.c \ - vnet/dpo/l2_bridge_dpo.c + vnet/dpo/dvr_dpo.c nobase_include_HEADERS += \ vnet/dpo/load_balance.h \ @@ -1109,7 +1142,8 @@ nobase_include_HEADERS += \ ######################################## libvnet_la_SOURCES += \ - vnet/util/radix.c \ + vnet/util/radix.c \ + vnet/util/refcount.c \ vnet/util/trajectory.c ######################################## @@ -1135,7 +1169,8 @@ libvnet_la_SOURCES += \ vnet/bier/bier_disp_entry.c \ vnet/bier/bier_disp_lookup_node.c \ vnet/bier/bier_disp_dispatch_node.c \ - vnet/bier/bier_disp_table.c + vnet/bier/bier_disp_table.c \ + vnet/bier/bier_bift_table.c nobase_include_HEADERS += \ vnet/bier/bier_types.h \ @@ -1146,6 +1181,21 @@ nobase_include_HEADERS += \ API_FILES += vnet/bier/bier.api +######################################## +# Test apps +######################################## + +noinst_PROGRAMS += tcp_echo udp_echo + +TEST_APPS_LDADD = libvlibmemoryclient.la libsvm.la libvppinfra.la +TEST_APPS_LDADD += -lpthread -lm -lrt + +tcp_echo_SOURCES = tests/vnet/session/tcp_echo.c +tcp_echo_LDADD = $(TEST_APPS_LDADD) + +udp_echo_SOURCES = tests/vnet/session/udp_echo.c +udp_echo_LDADD = $(TEST_APPS_LDADD) + ######################################## # Plugin client library ########################################