Skip to content

Commit

Permalink
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 4a188ea
Browse files Browse the repository at this point in the history
…..7963594

7963594 Merge branch 'release_internal' into release_external
9e31d11 Update apache license to config-files (ARMmbed#1781)
b8f840c Merge branch 'release_internal' into release_external
9495d94 Rename cfg-files to h-files (ARMmbed#1780)

git-subtree-dir: features/nanostack/sal-stack-nanostack
git-subtree-split: 7963594
  • Loading branch information
Arto Kinnunen committed Aug 13, 2018
1 parent 7e1fb3c commit f292d7a
Show file tree
Hide file tree
Showing 40 changed files with 295 additions and 110 deletions.
22 changes: 22 additions & 0 deletions source/configs/base/cfg_ethernet.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright (c) 2016-2018, Arm Limited and affiliates.
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* Config Flags for Ethernet Bootstrap */

#define HAVE_ETHERNET

#define HAVE_IPV6_ND
18 changes: 18 additions & 0 deletions source/configs/base/cfg_local_socket.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/*
* Copyright (c) 2016-2018, Arm Limited and affiliates.
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#define HAVE_LOCAL_SOCKET
26 changes: 26 additions & 0 deletions source/configs/base/cfg_lowpan_border_router.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* Copyright (c) 2016-2018, Arm Limited and affiliates.
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* Config Flags for 6LoWPAN Border router */
#include "cfg_lowpan_router.h"

#define HAVE_RPL_ROOT
#define HAVE_RPL_DAO_HANDLING
#define HAVE_6LOWPAN_BORDER_ROUTER
#define WHITEBOARD
#define HAVE_ND_PROXY
#define MULTICAST_FORWARDING
21 changes: 21 additions & 0 deletions source/configs/base/cfg_lowpan_host.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
* Copyright (c) 2016-2018, Arm Limited and affiliates.
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* Config Flags for 6LoWPAN Host */
#define HAVE_IPV6_ND
#define HAVE_6LOWPAN_ND
#define HAVE_MPL
22 changes: 22 additions & 0 deletions source/configs/base/cfg_lowpan_router.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright (c) 2016-2018, Arm Limited and affiliates.
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* Config Flags for 6LoWPAN Router */
#include "cfg_lowpan_host.h"

#define HAVE_6LOWPAN_ROUTER
#define HAVE_RPL
18 changes: 18 additions & 0 deletions source/configs/base/cfg_rf_tunnel.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/*
* Copyright (c) 2016-2018, Arm Limited and affiliates.
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#define HAVE_RF_TUNNEL
22 changes: 22 additions & 0 deletions source/configs/base/cfg_thread_border_router.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright (c) 2016-2018, Arm Limited and affiliates.
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "cfg_thread_router.h"

#define HAVE_THREAD_BORDER_ROUTER
#define HAVE_ND_PROXY
#define MULTICAST_FORWARDING
21 changes: 21 additions & 0 deletions source/configs/base/cfg_thread_end_device.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
* Copyright (c) 2016-2018, Arm Limited and affiliates.
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* Thread feature is active with minimal functionality */
#define HAVE_THREAD

#define HAVE_MPL
24 changes: 24 additions & 0 deletions source/configs/base/cfg_thread_full_end_device.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
* Copyright (c) 2016-2018, Arm Limited and affiliates.
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* Thread Full End Device configuration file.
*/
#include "cfg_thread_end_device.h"

/* Flag to enable Thread Neighbor discovery */
#define HAVE_THREAD_NEIGHBOR_DISCOVERY
27 changes: 27 additions & 0 deletions source/configs/base/cfg_thread_router.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Copyright (c) 2016-2018, Arm Limited and affiliates.
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "cfg_thread_full_end_device.h"

/* Enable DHCP server functionality */
#define HAVE_DHCPV6_SERVER

/* Flag for Thread router specific functionality */
#define HAVE_THREAD_ROUTER

/* Flag to enable Thread leader capability */
#define HAVE_THREAD_LEADER_SERVICE
5 changes: 0 additions & 5 deletions source/configs/base/ethernet.cfg

This file was deleted.

1 change: 0 additions & 1 deletion source/configs/base/local_socket.cfg

This file was deleted.

9 changes: 0 additions & 9 deletions source/configs/base/lowpan_border_router.cfg

This file was deleted.

4 changes: 0 additions & 4 deletions source/configs/base/lowpan_host.cfg

This file was deleted.

5 changes: 0 additions & 5 deletions source/configs/base/lowpan_router.cfg

This file was deleted.

1 change: 0 additions & 1 deletion source/configs/base/rf_tunnel.cfg

This file was deleted.

5 changes: 0 additions & 5 deletions source/configs/base/thread_border_router.cfg

This file was deleted.

5 changes: 0 additions & 5 deletions source/configs/base/thread_end_device.cfg

This file was deleted.

7 changes: 0 additions & 7 deletions source/configs/base/thread_full_end_device.cfg

This file was deleted.

11 changes: 0 additions & 11 deletions source/configs/base/thread_router.cfg

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Arm Limited and affiliates.
* Copyright (c) 2016, 2018, Arm Limited and affiliates.
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -16,6 +16,6 @@
*/


#include "base/ethernet.cfg"
#include "base/cfg_ethernet.h"

#define NO_RADV_TX
12 changes: 6 additions & 6 deletions source/configs/generic.cfg → source/configs/cfg_generic.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2016-2017, Arm Limited and affiliates.
* Copyright (c) 2014, 2016-2018, Arm Limited and affiliates.
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -15,11 +15,11 @@
* limitations under the License.
*/

#include "base/thread_border_router.cfg"
#include "base/ethernet.cfg"
#include "base/lowpan_border_router.cfg"
#include "base/local_socket.cfg"
#include "base/rf_tunnel.cfg"
#include "base/cfg_thread_border_router.h"
#include "base/cfg_ethernet.h"
#include "base/cfg_lowpan_border_router.h"
#include "base/cfg_local_socket.h"
#include "base/cfg_rf_tunnel.h"

#define FEA_TRACE_SUPPORT
#define EXTRA_CONSISTENCY_CHECKS
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2016, Arm Limited and affiliates.
* Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -15,9 +15,9 @@
* limitations under the License.
*/

#include "base/lowpan_border_router.cfg"
#include "base/ethernet.cfg"
#include "base/local_socket.cfg"
#include "base/cfg_lowpan_border_router.h"
#include "base/cfg_ethernet.h"
#include "base/cfg_local_socket.h"

#define HAVE_AES
#define FEA_TRACE_SUPPORT
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2017, Arm Limited and affiliates.
* Copyright (c) 2015-2018, Arm Limited and affiliates.
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -15,10 +15,10 @@
* limitations under the License.
*/
/* This is for linux router which use RF tunnel interface */
#include "base/lowpan_border_router.cfg"
#include "base/ethernet.cfg"
#include "base/local_socket.cfg"
#include "base/rf_tunnel.cfg"
#include "base/cfg_lowpan_border_router.h"
#include "base/cfg_ethernet.h"
#include "base/cfg_local_socket.h"
#include "base/cfg_rf_tunnel.h"

#define HAVE_AES
#define FEA_TRACE_SUPPORT
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2016, Arm Limited and affiliates.
* Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -15,10 +15,10 @@
* limitations under the License.
*/
/* This is for linux router which use RF tunnel interface */
#include "base/lowpan_border_router.cfg"
#include "base/ethernet.cfg"
#include "base/local_socket.cfg"
#include "base/rf_tunnel.cfg"
#include "base/cfg_lowpan_border_router.h"
#include "base/cfg_ethernet.h"
#include "base/cfg_local_socket.h"
#include "base/cfg_rf_tunnel.h"

#define ECC
#define HAVE_AES
Expand Down
Loading

0 comments on commit f292d7a

Please sign in to comment.