Florin Coras [Thu, 16 Jan 2020 19:15:54 +0000 (11:15 -0800)]
classify: fix pcap filter set init
Type: fix
Change-Id: I6a48a6c14bfb84b3460e8211021bc9df6e915dba
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit
cd681adab40f49d1305144b6bbbd5118e63a2805)
Yulong Pei [Wed, 8 Jan 2020 17:12:43 +0000 (01:12 +0800)]
lb: fix that lb_add_del_vip and lb_add_del_as api doesn't work correctly
Currently if user want to set ip4 address to the api, it must convert to ip6
format, e.g. user want to ip4 "90.1.2.1" but must convert to "::5A01:0201",
it is not acceptable, this fix solved the issue.
Ticket: FDIO-753
Type: fix
Change-Id: I2ffa5a3d38400ee176cf601421074f71fc395f03
Signed-off-by: Yulong Pei <yulong.pei@intel.com>
(cherry picked from commit
db43bb6af78c33e47d29889b047cced4b11fe4d7)
Ahmed Abdelsalam [Sun, 8 Dec 2019 11:58:27 +0000 (12:58 +0100)]
sr: some fixes for SRv6 CLI/API
Return FIB table_id instead of vrf_index to clients
Type: fix
Signed-off-by: Ahmed Abdelsalam <ahabdels@cisco.com>
Change-Id: I76a97bad3ecd3ac8eb045efb1657eaa90c2a57b6
(cherry picked from commit
13e6fce7c5b3a16a6af0b27fc259ef3f65d8c861)
Florin Coras [Wed, 15 Jan 2020 20:18:35 +0000 (20:18 +0000)]
tcp: fix rxt delivered without sacks
Type: fix
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I69c245cb0e3f6d599a3270a485fa0a5845cde8eb
(cherry picked from commit
56cef059ef44434efe26d523caec1bb0af9c1d3b)
Florin Coras [Wed, 15 Jan 2020 01:30:46 +0000 (01:30 +0000)]
vcl: add rx event on epoll ctl if needed
Type: fix
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: Ib6d0387076a4bb0b52e4cdfdcd62b6060b704fe6
(cherry picked from commit
6e3c1f8ec3faa8f0cad591fada32ad2f506ec0a0)
Florin Coras [Wed, 15 Jan 2020 02:32:07 +0000 (02:32 +0000)]
udp: fix ipv6 listen port registration
Type: fix
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I7f2233eb9bf3d81a697f76ba985083cf1040e2e9
(cherry picked from commit
ff2fad1701d8274d602cc46f3f2323154d96dc9f)
Vijayabhaskar Katamreddy [Wed, 15 Jan 2020 21:45:19 +0000 (13:45 -0800)]
vppinfra: fixing compilation issues in 32-bit
Fixing compilation issuues for 32-bit also setting init flag for shm based bihash
Type: fix
Signed-off-by: Vijayabhaskar Katamreddy <vkatamre@cisco.com>
Change-Id: Ic2072c5ba7fc77d061ca9f1b844a71f6e22e58b2
(cherry picked from commit
f0bae64f6fd4c410c19f6ece688443f389932688)
Chris Luke [Thu, 16 Jan 2020 01:30:04 +0000 (20:30 -0500)]
build: Add missing version.h dependency in vnet
Two modules in vnet include vpp/app/version.h but there is
no explicit build dependency for this generated file. This
leaves a race condition in the build system that the Coverity
build has recently started triggering.
Change-Id: I8e2bb32feeb16e1bdd8efb0d2633cfdba60f51aa
Type: fix
Signed-off-by: Chris Luke <chrisy@flirble.org>
(cherry picked from commit
c171d01cdb5183c8bf640951e94af6b1fd5e3efc)
Simon Zhang [Tue, 24 Dec 2019 12:02:20 +0000 (20:02 +0800)]
tcp: fix tcp check tx offload issue
Type: fix
Signed-off-by: Simon Zhang <yuwei1.zhang@intel.com>
Change-Id: I3b8755831d762abf51e1cbe1b57024f9297de9a4
Signed-off-by: Simon Zhang <yuwei1.zhang@intel.com>
(cherry picked from commit
79bfb9e09c7bf2072d34b2ed6159ba11815dab3a)
Yu Ping [Tue, 14 Jan 2020 22:24:44 +0000 (06:24 +0800)]
tls: enable async node on demand
Type: fix
Change-Id: Iab7c65614c94497e8ec5a96624be72c1a139e486
Signed-off-by: Yu Ping <ping.yu@intel.com>
(cherry picked from commit
d63b356bdf29fbb80f810d341dcaf8f5f92121c1)
Alexander Chernavin [Wed, 15 Jan 2020 11:45:47 +0000 (06:45 -0500)]
ip6: during icmp to icmp6 translation truncate error messages
All translated ICMPv6 packets that exceed the minimal IPv6 MTU get
truncated but according to RFC 4443 2.4 only ICMPv6 error messages
(type < 128) need to be truncated.
With this commit, truncate only ICMPv6 error messages.
Type: fix
Change-Id: Ic455352de2ff4ff6aa3421b46a2a54923f2d3f80
Signed-off-by: Alexander Chernavin <achernavin@netgate.com>
(cherry picked from commit
180210f99b74b97b127b7800bdc7bd243713cbf4)
Florin Coras [Wed, 8 Jan 2020 22:01:54 +0000 (22:01 +0000)]
tcp: handle ack advancement with no holes and reneging
Type: fix
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I9afba8dc9e087b8c436fe568531c02614a577a7c
(cherry picked from commit
c95eefb393d05167ce6e35e5617179f536de0bda)
Dave Wallace [Wed, 12 Aug 2020 14:11:25 +0000 (14:11 +0000)]
docs: fix vpp-make-test-docs-merge-1908 doc upload
Type: fix
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I77929b7067b11015e66ee3e24f63a377b1f788e2
Benoît Ganne [Tue, 7 Jan 2020 12:40:17 +0000 (13:40 +0100)]
dpdk: enforce max tx retries
n_retry was never decremented and so never enforced.
Type: fix
Change-Id: I71d60a72c156286f7e5b82b1c77a723361317c69
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit
207a1633094526697729f322269b937f841aaf47)
Neale Ranns [Tue, 7 Jan 2020 01:41:16 +0000 (01:41 +0000)]
ct6: dst,src copy typo
Type: fix
Signed-off-by: Neale Ranns <nranns@cisco.com>
Change-Id: I266fa5dc637383fd8dac6592c9c266a1b70a73e9
(cherry picked from commit
629e268aa171a8bc03fb93fc995725b78ae64063)
Yu Ping [Thu, 9 Jan 2020 19:45:06 +0000 (03:45 +0800)]
tls: enable TLS OpenSSL plugin works in 3.0.0
Type: fix
Change-Id: Id1602981fcc6efed1b0efe79a1fc8177457acdb5
Signed-off-by: Yu Ping <ping.yu@intel.com>
(cherry picked from commit
1c6486f7b8a00a1358d5c8f4ea1d874073bbcd6c)
Nitin Saxena [Sat, 4 Jan 2020 06:58:42 +0000 (12:28 +0530)]
ip: avoid fib lookup for consecutive pkts having same source IP
Type: fix
Fixes:
be2286b0
This patch does following:
- If terminating frame has consecutive packets with same source IP, this patch
avoids fib lookup for those packets in ip4-local node. This drops cycle count
for ip4-local node on both ARM and x86. It being done by enabling dead code in
else {} case of ip4_local_check_src_x2() and ip4_local_check_src() functions.
- In case all packets in terminating frame have unique source IP (e.g:
incrementing), ip4-local is costlier by 2 cycles (broadwell)
Change-Id: I472ddc324716cec8bfe601568b8aeb7565f97ab3
Signed-off-by: Nitin Saxena <nsaxena@marvell.com>
(cherry picked from commit
2d18d2ea9f0e3d6c47d365ec135af651b14e8165)
Zhiyong Yang [Thu, 9 Jan 2020 09:20:57 +0000 (04:20 -0500)]
fib: leverage well-optimized clib_memcpy
Type: fix
Change-Id: I684910837ca4d9c8a07262459158bbb0423a33af
Signed-off-by: Zhiyong Yang <zhiyong.yang@intel.com>
(cherry picked from commit
d3d7ef5ec828ec895c6f90090118782e497b9084)
Florin Coras [Thu, 9 Jan 2020 16:41:31 +0000 (16:41 +0000)]
session: remove io event dispatch dbg msg
Type: fix
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I166ab7b96444587a3252925d3a28505e0db52d74
(cherry picked from commit
87b0c892947006cbfa80fd2af15e8edb4029f327)
Florin Coras [Wed, 8 Jan 2020 23:30:15 +0000 (23:30 +0000)]
tcp: fix persist assert
Type: fix
Persist and retransmit can pop at the same time.
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: Ia9530645cc84c83a881a75d7b4627197dc50ed29
(cherry picked from commit
a6696719cb9fcd8ab54a5007e91dac6aeffe4e70)
Florin Coras [Wed, 8 Jan 2020 18:49:59 +0000 (18:49 +0000)]
tcp: fix scoreboard assert
Type: fix
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I3c70b331932708a1b773392e089aed9dba9b3b31
(cherry picked from commit
edf1da94dc099c6e2ab1d455ce8652fada3cdb04)
Florin Coras [Wed, 8 Jan 2020 00:33:02 +0000 (00:33 +0000)]
tcp: fix last sacked with no holes
Type: fix
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: Id12b0a9b8bc47aef8b393544e5b4c8228ed6a606
(cherry picked from commit
479f7fec6a876bf06f6007c03fd7b9fa3404df54)
Florin Coras [Mon, 6 Jan 2020 20:23:07 +0000 (20:23 +0000)]
vppinfra: retry socket connect on EAGAIN
Type: fix
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I93577acf559a8fa639aab7ec3f7cdbe7df9a248d
(cherry picked from commit
42ddf69ed0560cff70a2f3fafc732fc5a33255c0)
Florin Coras [Wed, 8 Jan 2020 02:37:57 +0000 (02:37 +0000)]
svm: fix eventfd signal write error check
Type: fix
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I706c8642ca0877430a42cc0ca5bc61a45428fc98
(cherry picked from commit
e4a08c1f3bf58670ff94382b2821518ad954a854)
Dave Barach [Tue, 7 Jan 2020 17:29:10 +0000 (12:29 -0500)]
vlib: fix coverity warning / real bug
The path must be next-to-impossible to hit, because the code has been
wrong for at least 5 years.
Type: fix
Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I23b8c4e1631827e7931f353c561c1e19c596c598
(cherry picked from commit
5c944eef7012e7c5b363399ed92966fb659196b7)
Yu Ping [Mon, 6 Jan 2020 20:02:55 +0000 (04:02 +0800)]
tls: Make tls CPS test run for a quite long time
Type: fix
Change-Id: I8cfb48bd7f92689b296861dd368186408918061b
Signed-off-by: Yu Ping <ping.yu@intel.com>
(cherry picked from commit
a9ed934745403461834b4361f06bd3865682f368)
Florin Coras [Sat, 4 Jan 2020 00:53:04 +0000 (00:53 +0000)]
tcp: fix duplicate sack whith reneging
Type: fix
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I6f7fb91e059996ff702eb9c36e3abaed237fe221
(cherry picked from commit
067f8f963d64b1cbc70f2b78ebd2c6d3791e7d22)
Florin Coras [Mon, 23 Dec 2019 18:03:27 +0000 (10:03 -0800)]
tcp: fix rate samples for old acks
Type: fix
Change-Id: Ieab35bbfba81faae61b1267d8661df5195877824
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit
2f04cb9f142abef82cd379432cecdafef9e776db)
Jon Loeliger [Tue, 26 Nov 2019 14:11:11 +0000 (08:11 -0600)]
build: Fix Subject-line feature list extraction
Bang on sed until a better incantation appears.
Change-Id: Ib8ad0996b6325db0fe983c86dd7dc553c9d388c4
Type: fix
Fixes:
26ce6ca1fe6f524a9049444fe8d55042fd7530a6
Signed-off-by: Jon Loeliger <jdl@netgate.com>
(cherry picked from commit
171577e129363aec30640a50f91cf0ff46d61bb9)
Florin Coras [Fri, 27 Dec 2019 18:26:56 +0000 (10:26 -0800)]
svm: broadcast on raw dequeues and full rings
Type: fix
Change-Id: I0cac9001290e7ed4e2e318ae62c56e97ec75a3db
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit
fea813ae3de5343a2bc91306fddf6dbd1832f93d)
hanlin [Mon, 30 Dec 2019 08:25:20 +0000 (16:25 +0800)]
vcl: hold errno when calling LDBG
Type: fix
Call trace of LDBG:
LDBG->clib_warning->_clib_error->dispatch_message->os_puts->writev
However, writev will hijacked by LDP, and then execute following code:
if ((errno = -ldp_init ()))
return -1;
Now, errno will be set.
Because we always call LDBG just before return from ldp_accept4, listen,
and etc. So errno will be overwritted after LDBG called.
Signed-off-by: hanlin <hanlin_wang@163.com>
Change-Id: I7a90f3a14772994f11f09650481411796e3f5630
(cherry picked from commit
9f3f18f99fd321cdcfc331e92b10b64f0ef590b3)
hanlin [Thu, 26 Dec 2019 03:44:28 +0000 (11:44 +0800)]
vcl: EPOLLOUT should be generated when epoll_ctl called with EPOLLOUT
event
Type: fix
When we call epoll_ctl to add or mod fd with EPOLLOUT event, mostly to
check if we can write. So we expect a EPOLLOUT event should be generated
immediately unless tx queue is full.
Signed-off-by: hanlin <hanlin_wang@163.com>
Change-Id: Ie99986a44dbb07b6ff2fba6512171056f79e77bd
(cherry picked from commit
475c9d7bcd0f2ceca77022eaef67ad9a84365609)
Florin Coras [Sun, 22 Dec 2019 17:20:26 +0000 (09:20 -0800)]
tcp: accept sack reneging as a cc event
Type: fix
Change-Id: Iead1303ca3dec7593eb3ce54f291b82d94c821a4
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit
1de7167e7a12a80cc5996959aeb1fbe4b2853ccb)
Jon Loeliger [Thu, 19 Dec 2019 15:03:52 +0000 (09:03 -0600)]
interface: Prevent bad inner-dot1q any exact-match configuration
Someone much more knowledgeable than I wrote:
For L3 IP forwarding, any VLAN tags on a packet must be exact
match to a sub-interface which means both outer and inner VLAN
tag IDs must be exact-matched to specific values defined of that
sub-interface. Without exact match on a L3 sub-interface, VPP
has no mechanism to know what VLAN tags to use for packet output,
such as ARP request packets or IP packets, on that sub-interface.
Thus, sub-interface with "inner-dot1q any" is not an exact match
sub-interface by definition since no match is present on inner
tag.
While in the area, fix a memory leak that would ensue on poorly
configured interfaces.
Change-Id: I8d17a96dbca3e3724c297ecc935ca61764e6ce2e
Type: fix
Signed-off-by: Jon Loeliger <jdl@netgate.com>
(cherry picked from commit
b22e1f06bbebc48ec72ce8effa529e69ffbb12ca)
Damjan Marion [Thu, 7 Nov 2019 10:32:16 +0000 (11:32 +0100)]
build: use cmake build types
Type: make
Change-Id: If822c85d6ff26982516ea1d597ca81aa84773b2b
Signed-off-by: Damjan Marion <damarion@cisco.com>
(cherry picked from commit
2baa115da3b752cd7e44cc477f2c45bda22d444b)
Miklos Tirpak [Thu, 19 Dec 2019 11:06:20 +0000 (12:06 +0100)]
gtpu: Track the dst FIB entry instead of RR sourcing that
RR sourcing the destination FIB entry limits the number of tunnels
to 255 for a particular destination. This change removes this limit.
Type: fix
The patch is based on
1f50bf8fc57ebf78f9056185a342493be460a847
that introduced the FIB entry tracking but did not update
the gtpu plugin.
Signed-off-by: Miklos Tirpak <miklos.tirpak@gmail.com>
Change-Id: I8a4a87382a6eb5120e2bb65b9bc3c446bbfdbd3b
(cherry picked from commit
75c72369186f6341a13374d2dd6e60ce3c7a88a6)
Christian E. Hopps [Fri, 27 Sep 2019 17:52:50 +0000 (13:52 -0400)]
misc: don't os_exit(1) causing core on SIGINT
It's not typical for a program to core when it receives a SIGINT, so
keep this from happening.
Type: fix
Signed-off-by: Christian E. Hopps <chopps@chopps.org>
Change-Id: I2c15985a57e6ea898ff05c4001e4b30b41154eba
(cherry picked from commit
10a8bda37eed33ada1e7c6ece7bda1fe066ba541)
Christian E. Hopps [Fri, 27 Sep 2019 18:35:32 +0000 (14:35 -0400)]
pg: don't leak open files in packet-generator
Fix pg code to close it's open file descriptors before zero'ing the
pcap_main structure for re-use.
Ticket: VPP-1780
Type: fix
Signed-off-by: Christian E. Hopps <chopps@chopps.org>
Change-Id: I32945c6476ae83b8d210ee67ac78db3e8f786f46
(cherry picked from commit
19871f25394fa9a4bfb55006092cbcc28b446c04)
Paul Vinciguerra [Sun, 3 Nov 2019 14:50:15 +0000 (09:50 -0500)]
vpp: fix .short_help for "ip virtual"
Type: fix
"# <feature-name>: <subject>
Change-Id: I8b6b6b8c70faec7cd95e1842259e907fb9587017
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
(cherry picked from commit
0812aea046209dc990ec704258570f46d3fa74c8)
Paul Vinciguerra [Thu, 7 Nov 2019 22:20:48 +0000 (17:20 -0500)]
vxlan geneve gtpu: fix short help
Type: fix
Change-Id: Id53eb6ed15f270d747b9831a7b585cbafe515dd2
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
(cherry picked from commit
5fb2278cb8badbbfe727acbdcaeda008a7fd2833)
Paul Vinciguerra [Wed, 23 Oct 2019 20:07:32 +0000 (16:07 -0400)]
ip: cleanup punt socket cli help
Make the help string consistent with the cli parser.
Type: fix
Change-Id: I7140bd589c2a94dbf5af5cc633cb495457a6af22
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
(cherry picked from commit
32c4d38f7ac6fe22abb0b4859f6075bb9b661773)
Paul Vinciguerra [Wed, 6 Nov 2019 18:25:17 +0000 (13:25 -0500)]
feature: add descriptive cli command output for 'set interface feature'
DBGvpp# set interface feature local0 arp-foo arc bad-arc
set interface feature: Unknown arc name (bad-arc)...
DBGvpp# set interface feature local0 arp-foo arc arp
set interface feature: Feature (arp-foo) not registered to arc (arp)...
See 'show features verbose' for valid feature/arc combinations.
DBGvpp# set interface feature local0 arp-disabled arc arp
Type: fix
Change-Id: I036bb2a75dd2d40f6901e4fde3eb14925238e19b
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
(cherry picked from commit
a4e2e7cc95250220e0d892eb11dcc0adc9fd7e22)
Paul Vinciguerra [Wed, 6 Nov 2019 20:41:45 +0000 (15:41 -0500)]
feature: add [verbose] to show features help
Type: fix
Change-Id: Idf694477c18852e5541c28a493a56b302122e46c
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
(cherry picked from commit
baa171041bc950f192c147f7b79a8add2299b74a)
GordonNoonan [Wed, 4 Dec 2019 15:16:40 +0000 (15:16 +0000)]
vlib: fix startup-config-process stack overflow
Type: fix
Startup config setting an i40e/ice interface
up in Debug VPP consumes more than the currently
available stack space.
Signed-off-by: GordonNoonan <gordon.noonan@intel.com>
Change-Id: I98b52c5596799017b97f802a8661b76cd1bb3245
(cherry picked from commit
b2dbb36fc265b8996fc7fa310dda447d5b0479cb)
Vratko Polak [Fri, 6 Dec 2019 15:49:36 +0000 (16:49 +0100)]
vlib: fix an issue with show pci
The fix has been received over e-mail from Lijian Zhang.
https://lists.fd.io/g/vpp-dev/message/14808
Type: fix
Ticket: VPP-1805
Change-Id: I73e5fe7dcbe2b0b1c639d844f29183eab3b6dd66
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
(cherry picked from commit
dea0b23fa73fe3d53b8f3b004f7b8a2a8456d7f7)
Bernhard M. Wiedemann [Thu, 5 Dec 2019 15:51:26 +0000 (16:51 +0100)]
build: Allow to override build date with SOURCE_DATE_EPOCH
and make host and user overridable
in order to make builds reproducible.
See https://reproducible-builds.org/ for why this is good
and https://reproducible-builds.org/specs/source-date-epoch/
for the definition of this variable.
Also switch to UTC to be independent of timezone.
Also use ISO 8601 date format to be easier to parse.
This is similar to
c9f40227836b827b71a6cbc4744d4b7151b2fcef
and
df82ec8fe7d91467c8b479bba74c761c0a6ffc59
which was lost in the move away from automake.
Note: This date call is designed to work with different flavors
of date (GNU, BSD and others).
If only GNU (Linux) support is needed, the patch can be simplified.
This PR was done while working on reproducible builds for openSUSE.
Type: fix
Change-Id: If4cab12320e6b5fcb1f2842fac5d745b33b01ed7
Signed-off-by: Bernhard M. Wiedemann <bwiedemann@suse.de>
(cherry picked from commit
3d14f036199d9b3098268821424b4e6f5e8f46dc)
Benoît Ganne [Mon, 16 Dec 2019 14:49:47 +0000 (15:49 +0100)]
vlib: fix vector-as-C-string overflow
Type: fix
Change-Id: If0419ff1a82d45e5b3326973008e1b9feb290c5a
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit
62d9fda8e474f87459c6e24d13b09f7bfec146f3)
Benoît Ganne [Tue, 10 Dec 2019 11:44:46 +0000 (12:44 +0100)]
classify: forbid invalid match config
Forbid too long match to be configured.
Type: fix
Change-Id: Icfced0f86821d5febd6a3c81e1315bd9737498c0
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit
71a70d73f34f7c057dd95dbca39fb8e602087a75)
Benoît Ganne [Mon, 16 Dec 2019 15:00:14 +0000 (16:00 +0100)]
vppinfra: fix cpu flag string overflow
Type: fix
Change-Id: Idb1fff8a172034044bb33d5b271a84d1fd672ef5
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit
a7cb357491bc8adeac23a329685e8ea9aa2d2f33)
Benoît Ganne [Mon, 16 Dec 2019 14:51:38 +0000 (15:51 +0100)]
l2: fix l2input_feat_names overflow
Type: fix
Change-Id: I59549b3aab5a0ccfe7db02757f78528e028121a5
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit
70ef0faea9f706004c068fb843797a7cb08a9e68)
Neale Ranns [Tue, 10 Dec 2019 01:08:19 +0000 (01:08 +0000)]
ipsec: Init salt value in SA creation CLI (so it's not random)
Type: fix
Change-Id: Idf4d0b59a1eb2c739a67a4786470884050f81561
Signed-off-by: Neale Ranns <nranns@cisco.com>
(cherry picked from commit
8dc75c0cc3ac0db13778a0a32f9aa81597b80556)
Florin Coras [Sat, 7 Dec 2019 01:05:08 +0000 (17:05 -0800)]
api: fix sock reg passing on read event
Type: fix
Change-Id: I383242e04a114b69fe247d912842be3560e96c10
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit
5224b5cbd51ed48d1d2ce2a412998d8a944c480b)
Benoît Ganne [Sat, 7 Dec 2019 16:14:27 +0000 (09:14 -0700)]
ipsec: make sure pad_bytes does not exceed pad data size
This helps GCC understand the memcpy will not overflow pad_data. GCC-6
(default on Debian 9) in particular got confused.
Type: fix
Change-Id: I176eb01531b9d5c7ebec40f015e510b2d56e77c4
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit
4505f0154eaba59c432c869b65e2dc493837032a)
johny [Fri, 6 Dec 2019 12:58:35 +0000 (13:58 +0100)]
ip: coverity fix
Delete Null-checking "p0" in function ip6_tcp_udp_icmp_bad_length,
because it's not necessary.
Type: fix
Signed-off-by: johny <jan.cavojsky@pantheon.tech>
Change-Id: I2bf43a60c1c1d76e42581df27f2285c9e9563093
(cherry picked from commit
a633a4318bea2f9edcb80d9685b0f811cac679ea)
Florin Coras [Fri, 6 Dec 2019 04:10:53 +0000 (20:10 -0800)]
api: fix free socket process args
Type: fix
Change-Id: I910be067de6ed65790d25cc95a3d8b5b66680567
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit
b0384230d95d9de5e5fec0a311b8644c99f85c31)
wanghanlin [Mon, 16 Dec 2019 11:14:39 +0000 (19:14 +0800)]
vcl: RX event may lost when accept session repeatedly
Type: fix
Some applications may call accept repeatedly to process all connect
request until get EAGIAIN error. Subsequent call may get RX event of
previous accepted session, then should process it rather than just
discard it.
Signed-off-by: wanghanlin <wanghanlin@corp.netease.com>
Change-Id: Ice53442de66289a62591b79a9cc31e883e894c23
(cherry picked from commit
96453fd2417ebd1d69354a7fb692976129cea80e)
Florin Coras [Thu, 5 Dec 2019 20:05:57 +0000 (12:05 -0800)]
session: close for reset replies independent of state
Type: fix
Change-Id: I8b8875f1dc9203dfbb443ac43df8250cbb0b1edc
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit
f1910326d537ad7692d4a9b807ebbef93106acea)
Florin Coras [Sat, 16 Nov 2019 01:56:48 +0000 (17:56 -0800)]
tcp: fix tail rescue with sacks
Type: fix
Change-Id: Iad73f47cef3d29c4b0b7d1f58f2f2b14ba4b1d38
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit
3eba7f1575a17b77924bf5be67b03b0227d04b78)
johny [Fri, 11 Oct 2019 16:28:51 +0000 (18:28 +0200)]
ip: fix cancel termination after receive malformed ip6 packet
This fix is for cancel termination of vpp after receive malformed
packet type of ip6.To avoid termination of vpp are checked if are
missing data in packet. This occours, when payload length in ip6
header packet is more than real count of data in packet. When
this error occours, packet is ignore.
Type: fix
Ticket: VPP-1693, VPP-1694
Change-Id: I9d9ecea7b75c8702cb31aa8051c8d4d7ce19659d
Signed-off-by: johny <jan.cavojsky@pantheon.tech>
(cherry picked from commit
17478e4eb81d384f171ca27c9110a051cd434f16)
Klement Sekera [Thu, 5 Dec 2019 13:13:21 +0000 (13:13 +0000)]
tests: fix wrong checksum error message
This change fixes the error message, which would previously report
mismatch on IPv6 layer instead of TCP layer.
Type: fix
Change-Id: Ie78779685362a420d155f928b3cdb341bc3fb8bc
Signed-off-by: Klement Sekera <ksekera@cisco.com>
(cherry picked from commit
66cea092c7a584bb7b82000fbfad349e6f0af7e1)
Yu Ping [Tue, 3 Dec 2019 22:49:04 +0000 (06:49 +0800)]
vcl: resolve VCL part session cleanup issue
In Nginx performance test, we notice that there are so many session kept
open with the state of TRANSPORT_DELETE, and it is root caused that
vppcom fails to return close state.
Type: fix
Change-Id: Ia30f959e0e5adb5b8bcfa13fb1dd7b2cb410a31b
Signed-off-by: Yu Ping <ping.yu@intel.com>
(cherry picked from commit
b2955355cc9a654447d8647e33def67cd27892f6)
Yu Ping [Thu, 28 Nov 2019 19:14:42 +0000 (03:14 +0800)]
tls: change SSL_has_pending to avoid BIO check error
Type: fix
Change-Id: I454aff1b187b75a1328c90e30b9b487377ae5f68
Signed-off-by: Yu Ping <ping.yu@intel.com>
(cherry picked from commit
ce9bdfe5fcfa6e2acd670ea0063ce5e0fde15096)
Jon Loeliger [Wed, 4 Dec 2019 17:46:52 +0000 (11:46 -0600)]
map: Fix a coverity MAP dead-code issue.
Type: fix
Change-Id: I5467bbe3b25b1ea3fb44157abe6e7bfb3f191e77
Signed-off-by: Jon Loeliger <jdl@netgate.com>
(cherry picked from commit
3aae3dc7acddbe2f46de785b50c3358b7d3e0acc)
Jon Loeliger [Thu, 21 Nov 2019 17:15:53 +0000 (11:15 -0600)]
map: Avoid null dereference in 'map show' and 'map del'
If a map domain is created without a tag name, inspecting
the map data will segfault looking for an unset name in
the so-called "domain extras" vector.
Enhance "show map domain" to show all map domains.
Type: fix
Change-Id: Ic55662b84eec58221816da270b2ef9e89c3a31c3
Signed-off-by: Jon Loeliger <jdl@netgate.com>
(cherry picked from commit
4a6d093e7ef72b06b35ffee911d35033dfde0171)
Florin Coras [Wed, 27 Nov 2019 02:43:25 +0000 (18:43 -0800)]
ip: init l3_hdr_offset when pushing an ip4 header
Type: fix
Change-Id: I87503b9a981724b1f3ff1c45a4a5f7a43024ca76
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit
757de9873bbaf2d21d107da42c6bbeb2804c7fcc)
Benoît Ganne [Thu, 21 Nov 2019 15:50:24 +0000 (16:50 +0100)]
tests: display stdout and stderr when output caching is disabled
Type: fix
Change-Id: I4286ba58bb15dd67c1199f76166bedf3b4e0344c
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit
1a7ed5e3e62dfe77832022a46ee32d744a347ac5)
Chenmin Sun [Thu, 21 Nov 2019 21:33:40 +0000 (05:33 +0800)]
flow: fix several crash issues
Type: fix
This patch fixes crash issues(marked in brackets) in the below test cases
test flow enable index 0 1/1 -> [crash]
test flow disable index 0 1/1 -> [crash]
test flow add src-ip 192.168.8.8 proto udp redirect-to-queue 8
test flow enable index 0 1/1
test flow disable index 0 1/1 - [crash]
test flow add src-ip 192.168.8.8 proto udp redirect-to-queue 8
test flow enable index 0 1/1
test flow enable index 0 1/2
test flow del index 0 -> [crash]
Signed-off-by: Chenmin Sun <chenmin.sun@intel.com>
Change-Id: I84bc6faa3d93a2cab4c82e8a876a8b1067257b62
(cherry picked from commit
be2ad0b4743ed8a3875a5b6039c10c66eb07614c)
Jon Loeliger [Tue, 26 Nov 2019 19:47:49 +0000 (13:47 -0600)]
map: Fix inverted 'map security check enable' CLI flag.
Type: fix
Fixes:
5a2e278a09726be627b8310e03f0522d60aafedf
Change-Id: Ibdc2f0be44e382bfa4a8f3e16be8d6239d7a0ec1
Signed-off-by: Jon Loeliger <jdl@netgate.com>
(cherry picked from commit
acaa04a22dd8bade2eca944ddd8517961433a34f)
Neale Ranns [Thu, 21 Nov 2019 09:37:41 +0000 (09:37 +0000)]
fib: Another realloc burn
Type: fix
harmless this time since it only affects the debug statement, but
it still crashes an ASAN image.
Signed-off-by: Neale Ranns <nranns@cisco.com>
Change-Id: Ie02e7fe3014b98b9f8c83447f59017a380ab3948
(cherry picked from commit
981a690b7d25c96ea56f95ece693377f95b93fc1)
Florin Coras [Sat, 23 Nov 2019 01:38:25 +0000 (17:38 -0800)]
tcp: invalidate expired timer handles before dispatching
Type: fix
Change-Id: Icc8cd05cb9c1844a9f8b0399797ad554f4ccf1a1
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit
b72a0ff73514ec7ea79ed3fad49b77d56b248642)
Paul Vinciguerra [Wed, 20 Nov 2019 04:30:53 +0000 (23:30 -0500)]
vppapigen: fix typo on f64 endian_string
Type: fix
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Change-Id: Id47e3f2c348f07c84d9c2499122fa25d6c74fb13
(cherry picked from commit
1c200dc492c02b1bf827e627f5a190b911fb34ec)
Paul Vinciguerra [Sun, 24 Nov 2019 02:02:27 +0000 (21:02 -0500)]
papi: add missing base types to serializer
File "/vpp/src/vpp-api/python/vpp_papi/vpp_serializer.py", line 512, in __init__
'Unknown message type {}'.format(f_type))
vpp_papi.vpp_serializer.VPPSerializerValueError: Unknown message type i16
Type: fix
Change-Id: Ibf73dc8df90153db586afe614e47be49739bac2f
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
(cherry picked from commit
ba2c7fad1d1448b40ea78f36e833821e9ab84687)
Andrew Yourtchenko [Mon, 18 Nov 2019 10:23:54 +0000 (10:23 +0000)]
vppinfra: fix coverity issue 205691 in pmalloc
set the address to MMAP_FAILED if mmap has failed,
so that we do not attempt to free it in the error
handling path.
Change-Id: I6e6b51a365fb68086dc20aa40a676a36af59a3ba
Type: fix
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
(cherry picked from commit
9ce35233658d6c19a4458ec7e728b6ee75fd3ace)
Filip Varga [Mon, 9 Sep 2019 14:55:19 +0000 (16:55 +0200)]
nat: respect arc features (multi worker)
Type: fix
Ticket: VPP-1747
Change-Id: If282aae3e584d7017c200f897b99c8a37eb1b2e5
Signed-off-by: Filip Varga <fivarga@cisco.com>
(cherry picked from commit
9a6dc8a9376e7270331255861b3ead1045b40c6d)
Jon Loeliger [Tue, 3 Dec 2019 16:51:23 +0000 (10:51 -0600)]
ip6: Fix improper MCAST adj test in IPv6 router solicitation
Type: fix
Fixes:
cb9cadad578297ffd78fa8a33670bdf1ab669e7e
Change-Id: Id6de9780da41db5d762fe042f533cfaf21ed7b73
Reported-by: Rajith PR <rajith@rtbrick.com>
Signed-off-by: Jon Loeliger <jdl@netgate.com>
(cherry picked from commit
a90b26c1ee5bc4410c2753b6683a2e50e275daf6)
Jon Loeliger [Tue, 3 Dec 2019 18:13:29 +0000 (12:13 -0600)]
build: Separate ip and ip6 maintainers
Boldly assign IPv6 to Neale and to me.
Ole said so. Really!
Change-Id: Iaa30a57230558dcf3ee016a94479cac95bb2d50d
Type: make
Signed-off-by: Jon Loeliger <jdl@netgate.com>
(cherry picked from commit
a6460e46f379315e872819af139ae2c87e8e06f3)
Klement Sekera [Wed, 29 Jan 2020 22:59:48 +0000 (22:59 +0000)]
bfd: add missing cast
Add missing cast to time conversion function to to deal with arbitrary
clocks-per-second values.
Type: fix
Change-Id: I5075a823e7a95c972c513ac765252337d5f59fbf
Signed-off-by: Klement Sekera <ksekera@cisco.com>
(cherry picked from commit
27d12d30cdf5af37fad0e14db0877ca716af2115)
Alexander Chernavin [Thu, 31 Oct 2019 14:38:43 +0000 (10:38 -0400)]
bfd: allow IPv6 link-local address as local address
Type: fix
Change-Id: Ia3dacd2628591f7ba9710e8e4d68df97ae21935c
Signed-off-by: Alexander Chernavin <achernavin@netgate.com>
(cherry picked from commit
845f51ffe2a2176dd3187e1eb96c00caee98980a)
Dave Barach [Sat, 9 Nov 2019 01:20:17 +0000 (20:20 -0500)]
dhcp: fix dhcpv6 client and dhcpv6 prefix delegation
Keep trying even if the interface in question is not "admin-up,
link-up." In real life, it's normal for link autonegotiation to take a
good fraction of a second. The driver layer takes care of packets sent
to an interface which can't transmit at the moment.
Renew address leases at the preferred renewal time, not at the
expiration time.
Type: fix
Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I68ec1c52cc1f4a8aa256185820748b845e92f7c1
(cherry picked from commit
20b962d3e494513ab28854936cc8bbc32891686b)
Nathan Skrzypczak [Wed, 4 Dec 2019 10:02:28 +0000 (11:02 +0100)]
session: fix session_main_get_worker_if_valid
Type: fix
Change-Id: Ie024792015f3c9c52102c9be03da63c79f3456af
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
(cherry picked from commit
901467ed75fa76e8fe4792459e3649d4aef4ddc7)
Florin Coras [Wed, 20 Nov 2019 01:23:22 +0000 (17:23 -0800)]
session: fix transport proto unformat
Type: fix
Change-Id: I38a5cbd53b278c21142bac4ee1bbe5dc8bcaaac9
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit
3bbbf0dbd367fd8611f9f390a2c6e31a89ce08a9)
Nathan Skrzypczak [Tue, 19 Nov 2019 15:48:58 +0000 (16:48 +0100)]
session: Fix out of order mq
Type: fix
Change-Id: I522db62db50fc0fa46a6dd7cddd32e2f09b5e5a6
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
(cherry picked from commit
989bc47d68187dd5db608d2b32abbbbc392b03ca)
Nathan Skrzypczak [Thu, 7 Nov 2019 16:55:01 +0000 (17:55 +0100)]
session: session enable in multiworker
Having session enable in config file wasn't
working for multiple workers
Type: fix
Change-Id: Ib29ba540a6e1d714e7e470f4c7518e3d266fe7ca
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
(cherry picked from commit
31bd035621bdc57deb757613b534bd6c2b032814)
Nathan Skrzypczak [Thu, 7 Nov 2019 09:29:24 +0000 (10:29 +0100)]
session: fix app attach on error
Type: fix
Change-Id: I57b3c76515544ba3655690b37e0dacb47734ba6d
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
(cherry picked from commit
9d3e1b433f394781a55a4c7c39b695d08dd2563f)
Benoît Ganne [Wed, 30 Oct 2019 13:46:40 +0000 (14:46 +0100)]
dhcp: fix proxy dhcpv6 size check
Type: fix
Change-Id: Ibbb25bc530fdeaa3083c9b833a286a5d40e93c1e
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit
60ad1a59a39872d0eff8ed0961fd81c5854c968b)
Klement Sekera [Wed, 23 Oct 2019 10:16:02 +0000 (10:16 +0000)]
ip: fix tracing of packet flags
This fixes incorrect tracing of flags such as MORE_FRAGMENTS.
Type: fix
Change-Id: Ia5698418a7cbb45c18bc9c95f560cea020e63c39
Signed-off-by: Klement Sekera <ksekera@cisco.com>
(cherry picked from commit
ea5cd12d26047c36be5969c2c88147d26f788103)
Ole Troan [Tue, 22 Oct 2019 12:01:53 +0000 (14:01 +0200)]
papi: fix default handling
The BaseTypers object were reused, so a default for anyother mesage
would be inherited in new messages.
Type: fix
Fixes:
85465588b18fef9c4712f864f512e00741e2d4f2
Change-Id: Ie1efb85a76b088653eb9ea4b88540c98b6b0aad0
Signed-off-by: Ole Troan <ot@cisco.com>
(cherry picked from commit
40dc4b35e3d946efbc5c2b8b0af5e52d67b7fe6c)
Nathan Skrzypczak [Wed, 18 Dec 2019 12:37:45 +0000 (13:37 +0100)]
quic: Hotfix crypto context on migrate
Type: fix
quicly_connections have internal references to crypto
contexts which need to be updated when we switch thread
as the supporting pools are thread-based.
This under the assumption that the new contexts will be
exactly identical
Change-Id: I38083e59657ff068e347d9e7b47abe91a1167b6c
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
(cherry picked from commit
d9942bcc61d83cee390fc2c6a428e562ec9750f0)
Dave Wallace [Fri, 1 Nov 2019 18:41:29 +0000 (14:41 -0400)]
quic: fix quicly rtt time skew
- This patch to quicly fixes an intermittent failure
in the rtt calculation when there is a time skew
Type: fix
Change-Id: If89c47401ee75c88f0eb65ae888b6914695b2aec
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
(cherry picked from commit
caa52f3f93fba4685aa91124646683529de38725)
Dave Wallace [Wed, 30 Oct 2019 23:40:33 +0000 (23:40 +0000)]
quic: remove redundant function calls
- session_transport_delete_notify() is called before
and inside quic_connection_delete()
Type: fix
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I5c79a3269e36c4aab5aa99fdfdac06c1334f0f6f
(cherry picked from commit
34d92ebde67efb96784e0360f25a3b3c3b86b8f0)
Florin Coras [Thu, 31 Oct 2019 02:43:57 +0000 (19:43 -0700)]
quic: disable failing test
Type: fix
Disable test until fixed.
Change-Id: I1f03630d126e61578c63a3536a0dd1a7b4da2b92
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit
3ad984732961d0a8ec3bd6e68a37a4927275419d)
Mathias Raoul [Tue, 6 Aug 2019 12:58:01 +0000 (14:58 +0200)]
quic: Add PICOTLS_INCLUDE_DIR var to CMakeLists.
Type: fix
Change-Id: I10ebcc653491d11ca798e0a60be6eeef82c41766
Signed-off-by: Mathias Raoul <mathias.raoul@gmail.com>
(cherry picked from commit
74dcbf97af4e55cb29932dad7d65472403c6006d)
Steven Luong [Wed, 11 Sep 2019 17:49:30 +0000 (10:49 -0700)]
misc: bond_create is broken for custom dump print
Regression from https://gerrit.fd.io/r/#/c/vpp/+/21508/
The aformentioned patch changed lb and mode to u32. But it does not make the
same change to custom_dump.c
Type: fix
Signed-off-by: Steven Luong <sluong@cisco.com>
Change-Id: I2b7d065e21427090af3deb47c8a24c5da679e4f5
(cherry picked from commit
b0876964893565d95fa934c9603dcde46a8caa0c)
Mrityunjay Kumar [Thu, 5 Sep 2019 05:10:25 +0000 (05:10 +0000)]
memif: 14 bytes extra overhead issue fixed.
Type: fix
Signed-off-by: Mrityunjay Kumar <kumarnitp@gmail.com>
Change-Id: I31cc5e853b57e285064647503231b251e5152d3f
(cherry picked from commit
3f0579e8df831d42745e0b97191eb5e4bcffb011)
Jan Cavojsky [Tue, 3 Mar 2020 15:25:58 +0000 (16:25 +0100)]
libmemif: don't consume rx queue interrupt, if memif_rx_burst fails
Type: fix
Signed-off-by: Jan Cavojsky <jan.cavojsky@pantheon.tech>
Change-Id: Ic6c15c88c80c4045c290cd78533be6f070c7470a
(cherry picked from commit
77a95cdce2f3d80dac2832b68310eb5b23769c0e)
Jakub Grajciar [Thu, 14 Nov 2019 09:47:25 +0000 (10:47 +0100)]
libmemif: memif_control_fd_update always pass context from libmemif_main
Event polling instance is always identified by libmemif main private context.
Fixes event polling handled by libmemif.
Type: fix
Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Change-Id: I51dcdb279b18f8ce97bad3b2695848e0b25a232d
(cherry picked from commit
6f090fa1fa44bb2de0565bbedb2756e37ea35040)
Jakub Grajciar [Wed, 11 Sep 2019 08:21:17 +0000 (10:21 +0200)]
memif: fix zero-copy arg overwrite
Type: fix
Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Change-Id: I9a34465c85597baecdbc672ce395265f7dbb7f00
(cherry picked from commit
8a1dea4ce6fd0684aef6d0b0843a90658775129d)
Neale Ranns [Tue, 7 Apr 2020 08:44:20 +0000 (08:44 +0000)]
gbp: More reliable unit-tests
Type: fix
the GBP unit tests would peridocially fail. The reason being that there
is dynamic state whose presence nneds to be created, tested and then
timeed out. The failures occurded when the timeout occured before the
state could be tested. the previous timeout was 2 seconds, this has been
doubled, as a result i saw no faliures running continuously for ~16
hours.
bumping the timer increasing the test run time from ~40 to ~53 seconds,
a small price to pay.
in test cases where the state is not timed out i bumped the timer to 60
seconds.
Signed-off-by: Neale Ranns <nranns@cisco.com>
Change-Id: I11b0970570caa8eebf486fe8cd8e44a4b2b1fc36
(cherry picked from commit
8d0d8d2fcccd77e462f30b21f7f8810db312ee62)
Aloys Augustin [Wed, 24 Jun 2020 09:33:20 +0000 (11:33 +0200)]
tests: fix deps pinning / patching
This ensures we don't recompute the requirements-{2,3}.txt on each make
test run, and skips patching scapy if it is already patched instead of
failing.
Change-Id: I3da57182ae49f3dd04db139d96734a5d145fedff
Type: fix
Signed-off-by: Aloys Augustin <aloaugus@cisco.com>
(cherry picked from commit
8eca60df745b7656b96db16e75b0deda66bfc515)
Dave Barach [Wed, 5 Aug 2020 20:12:35 +0000 (16:12 -0400)]
interface: add pcap trace data preallocation
Type: fix
Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I2e53fa85a0b4082666f57a3a58a09c04ae2001b5
(cherry picked from commit
586462fabcc913a5a4fa9115d4b5caf33dfdb347)