Commit 78909429 authored by Carsten Schoenert's avatar Carsten Schoenert

rebuild patch queue from patch-queue branch

removed patches (pplied upstream):
spelling-fix-apropriate-appropriate.patch
spelling-fix-bandwith-bandwidth.patch
spelling-fix-compatability-compatibility.patch
spelling-fix-outputing-outputting.patch
spelling-fix-seperate-separate.patch
spelling-fix-whith-with.patch

modified patch:
examples-Makefile.am-remove-DTLS_LIBS-variable.patch

added patch:
spelling-fix-Addtional-Additional.patch
parent edf59b09
......@@ -6,11 +6,11 @@ The functionality of the example binaries are hard depending on usage of
DTLS functions and the used library for that. Adding a dynamically
handling for the final used binary name.
---
examples/Makefile.am | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
examples/Makefile.am | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 64d66db..cea81fa 100644
index c0fa3a4..023e71a 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,6 +1,6 @@
......@@ -21,20 +21,22 @@ index 64d66db..cea81fa 100644
#
# This file is part of the CoAP C library libcoap. Please see README and
# COPYING for terms of use.
@@ -14,15 +14,18 @@ AM_CFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
@@ -13,18 +13,20 @@ AM_CFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_srcdir)/include/coap$(LIBCOAP_API_VERSION) \
$(WARNING_CFLAGS) $(DTLS_CFLAGS) -std=c99
# etsi_iot_01 and tiny are missing
-#
-bin_PROGRAMS = coap-client coap-server coap-rd
+bin_PROGRAMS = \
+ coap-client@LIBCOAP_DTLS_LIB_EXTENSION_NAME@ \
+ coap-server@LIBCOAP_DTLS_LIB_EXTENSION_NAME@ \
+ coap-rd@LIBCOAP_DTLS_LIB_EXTENSION_NAME@
check_PROGRAMS = coap-etsi_iot_01 coap-tiny
-coap_client_SOURCES = client.c
-coap_client_LDADD = $(top_builddir)/.libs/libcoap-$(LIBCOAP_NAME_SUFFIX).la
+coap_client@LIBCOAP_DTLS_LIB_EXTENSION_NAME@_SOURCES = client.c
+coap_client@LIBCOAP_DTLS_LIB_EXTENSION_NAME@_LDADD = $(top_builddir)/.libs/libcoap-$(LIBCOAP_NAME_SUFFIX).la
+coap_client@LIBCOAP_DTLS_LIB_EXTENSION_NAME@_LDADD = $(top_builddir)/.libs/libcoap-$(LIBCOAP_NAME_SUFFIX).la
-coap_server_SOURCES = coap-server.c
-coap_server_LDADD = $(top_builddir)/.libs/libcoap-$(LIBCOAP_NAME_SUFFIX).la
......@@ -46,4 +48,5 @@ index 64d66db..cea81fa 100644
+coap_rd@LIBCOAP_DTLS_LIB_EXTENSION_NAME@_SOURCES = coap-rd.c
+coap_rd@LIBCOAP_DTLS_LIB_EXTENSION_NAME@_LDADD = $(top_builddir)/.libs/libcoap-$(LIBCOAP_NAME_SUFFIX).la
endif # BUILD_EXAMPLES
coap_etsi_iot_01_SOURCES = etsi_iot_01.c
coap_etsi_iot_01_LDADD = $(DTLS_LIBS) $(top_builddir)/.libs/libcoap-$(LIBCOAP_NAME_SUFFIX).la
......@@ -13,11 +13,11 @@ partially removed by this commit.
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 3bceefc..64d66db 100644
index c34750b..c0fa3a4 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -17,12 +17,12 @@ AM_CFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
bin_PROGRAMS = coap-client coap-server coap-rd
@@ -18,13 +18,13 @@ bin_PROGRAMS = coap-client coap-server coap-rd
check_PROGRAMS = coap-etsi_iot_01 coap-tiny
coap_client_SOURCES = client.c
-coap_client_LDADD = $(DTLS_LIBS) $(top_builddir)/.libs/libcoap-$(LIBCOAP_NAME_SUFFIX).la
......@@ -31,4 +31,5 @@ index 3bceefc..64d66db 100644
-coap_rd_LDADD = $(DTLS_LIBS) $(top_builddir)/.libs/libcoap-$(LIBCOAP_NAME_SUFFIX).la
+coap_rd_LDADD = $(top_builddir)/.libs/libcoap-$(LIBCOAP_NAME_SUFFIX).la
endif # BUILD_EXAMPLES
coap_etsi_iot_01_SOURCES = etsi_iot_01.c
coap_etsi_iot_01_LDADD = $(DTLS_LIBS) $(top_builddir)/.libs/libcoap-$(LIBCOAP_NAME_SUFFIX).la
examples-Makefile.am-remove-DTLS_LIBS-variable.patch
examples-Makefile.am-create-DTLS-specific-binary-names.patch
spelling-fix-compatability-compatibility.patch
spelling-fix-funtion-function.patch
spelling-fix-outputing-outputting.patch
spelling-fix-apropriate-appropriate.patch
spelling-fix-whith-with.patch
spelling-fix-seperate-separate.patch
spelling-fix-bandwith-bandwidth.patch
spelling-fix-Addtional-Additional.patch
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Fri, 21 Dec 2018 08:03:31 +0100
Subject: spelling: fix Addtional -> Additional
---
include/coap2/coap_dtls.h | 2 +-
man/coap_encryption.txt.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/coap2/coap_dtls.h b/include/coap2/coap_dtls.h
index 2f61e03..756e0f9 100644
--- a/include/coap2/coap_dtls.h
+++ b/include/coap2/coap_dtls.h
@@ -226,7 +226,7 @@ typedef struct coap_dtls_pki_t {
coap_dtls_sni_callback_t validate_sni_call_back;
void *sni_call_back_arg; /**< Passed in to the sni call-back function */
- /** Addtional Security call-back handler that is invoked when libcoap has
+ /** Additional Security call-back handler that is invoked when libcoap has
* done the standerd, defined validation checks at the TLS level,
* If not @p NULL, called from within the TLS Client Hello connection
* setup.
diff --git a/man/coap_encryption.txt.in b/man/coap_encryption.txt.in
index ec1a219..12d6e1c 100644
--- a/man/coap_encryption.txt.in
+++ b/man/coap_encryption.txt.in
@@ -150,7 +150,7 @@ typedef struct coap_dtls_pki_t {
coap_dtls_sni_callback_t validate_sni_call_back;
void *sni_call_back_arg; /* Passed in to the sni call-back function */
- /** Addtional Security call-back handler that is invoked when libcoap has
+ /** Additional Security call-back handler that is invoked when libcoap has
* done the standerd, defined validation checks at the TLS level,
* If not NULL, called from within the TLS Client Hello connection
* setup.
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 24 Nov 2018 08:47:46 +0100
Subject: spelling: fix apropriate -> appropriate
---
man/coap_observe.txt.in | 2 +-
man/coap_pdu_setup.txt.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/man/coap_observe.txt.in b/man/coap_observe.txt.in
index 6fb0f81..84beed1 100644
--- a/man/coap_observe.txt.in
+++ b/man/coap_observe.txt.in
@@ -328,7 +328,7 @@ coap_optlist_t **options, unsigned char *data, size_t length, int observe) {
coap_optlist_t *opt;
(void)context;
- /* Create the pdu with the apropriate options */
+ /* Create the pdu with the appropriate options */
pdu = coap_pdu_init(msgtype, request_code, coap_new_message_id(session),
coap_session_max_pdu_size(session));
if (!pdu)
diff --git a/man/coap_pdu_setup.txt.in b/man/coap_pdu_setup.txt.in
index 2c37122..da7414b 100644
--- a/man/coap_pdu_setup.txt.in
+++ b/man/coap_pdu_setup.txt.in
@@ -244,7 +244,7 @@ unsigned char *data, size_t length, int observe) {
int res;
coap_optlist_t *optlist_chain = NULL;
- /* Create the pdu with the apropriate options */
+ /* Create the pdu with the appropriate options */
pdu = coap_pdu_init(msgtype, request_code, coap_new_message_id(session),
coap_session_max_pdu_size(session));
if (!pdu)
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 24 Nov 2018 08:54:14 +0100
Subject: spelling: fix bandwith -> bandwidth
---
README | 2 +-
doc/main.md | 2 +-
man/coap.txt.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/README b/README
index b516549..5c027cf 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ ABOUT LIBCOAP
libcoap is a C implementation of a lightweight application-protocol
for devices that are constrained their resources such as computing
-power, RF range, memory, bandwith, or network packet sizes. This
+power, RF range, memory, bandwidth, or network packet sizes. This
protocol, CoAP, is standardized by the IETF as RFC 7252. For further
information related to CoAP, see <http://coap.technology>.
diff --git a/doc/main.md b/doc/main.md
index 11b7efd..85e0f77 100644
--- a/doc/main.md
+++ b/doc/main.md
@@ -11,7 +11,7 @@ About libcoap
libcoap is a C implementation of a lightweight application-protocol
for devices that are constrained their resources such as computing
-power, RF range, memory, bandwith, or network packet sizes. This
+power, RF range, memory, bandwidth, or network packet sizes. This
protocol, CoAP, is standardized by the IETF as RFC 7252. For further
information related to CoAP, see <http://coap.technology>.
diff --git a/man/coap.txt.in b/man/coap.txt.in
index ed74a55..17b69ff 100644
--- a/man/coap.txt.in
+++ b/man/coap.txt.in
@@ -21,7 +21,7 @@ DESCRIPTION
libcoap is a C implementation of a lightweight application-protocol for
devices that are constrained by their resources such as computing power, RF
-range, memory, bandwith, or network packet sizes. This protocol, CoAP, is
+range, memory, bandwidth, or network packet sizes. This protocol, CoAP, is
standardized by the IETF as RFC 7252. For further information related to
CoAP, see http://coap.technology.
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 24 Nov 2018 08:42:04 +0100
Subject: spelling: fix compatability -> compatibility
---
examples/coap_list.h | 2 +-
include/coap2/coap_dtls.h | 2 +-
include/coap2/encode.h | 2 +-
man/coap_encryption.txt.in | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/examples/coap_list.h b/examples/coap_list.h
index 20d0a98..9f75b6c 100644
--- a/examples/coap_list.h
+++ b/examples/coap_list.h
@@ -21,7 +21,7 @@
* See 'man coap_pdu_setup' for further information.
*
* examples/coap_list.[ch] files will be removed in a future release
- * They are left here to support building backward compatability of old versions
+ * They are left here to support building backward compatibility of old versions
* of coap-client
*/
diff --git a/include/coap2/coap_dtls.h b/include/coap2/coap_dtls.h
index 4fe9fe3..1c1a10e 100644
--- a/include/coap2/coap_dtls.h
+++ b/include/coap2/coap_dtls.h
@@ -201,7 +201,7 @@ typedef struct coap_dtls_pki_t {
uint8_t allow_no_crl; /**< 1 ignore if CRL not there */
uint8_t allow_expired_crl; /**< 1 if expired crl is allowed */
uint8_t reserved[6]; /**< Reserved - must be set to 0 for
- future compatability */
+ future compatibility */
/* Size of 6 chosen to align to next
* parameter, so if newly defined option
* it can use one of the reserverd slot so
diff --git a/include/coap2/encode.h b/include/coap2/encode.h
index 818f4d5..2ba2aa1 100644
--- a/include/coap2/encode.h
+++ b/include/coap2/encode.h
@@ -74,7 +74,7 @@ unsigned int coap_encode_var_safe(uint8_t *buf,
/**
* @deprecated Use coap_encode_var_safe() instead.
- * Provided for backward compatability. As @p value has a
+ * Provided for backward compatibility. As @p value has a
* maximum value of 0xffffffff, and buf is usually defined as an array, it
* is unsafe to continue to use this variant if buf[] is less than buf[4].
*
diff --git a/man/coap_encryption.txt.in b/man/coap_encryption.txt.in
index b8a4ecc..1f2386b 100644
--- a/man/coap_encryption.txt.in
+++ b/man/coap_encryption.txt.in
@@ -127,7 +127,7 @@ typedef struct coap_dtls_pki_t {
uint8_t allow_no_crl; /* 1 ignore if CRL not there */
uint8_t allow_expired_crl; /* 1 if expired crl is allowed */
uint8_t reserved[6]; /* Reserved - must be set to 0 for
- future compatability */
+ future compatibility */
/** CN check call-back function
* If not NULL, is called when the TLS connection has passed the configured
......@@ -22,10 +22,10 @@ index e84a0b3..4e0d1f7 100644
*
* @param pdu The PDU where the token is to be added.
diff --git a/man/coap_logging.txt.in b/man/coap_logging.txt.in
index 7e4344a..d5629fb 100644
index 26228ad..c28a970 100644
--- a/man/coap_logging.txt.in
+++ b/man/coap_logging.txt.in
@@ -56,7 +56,7 @@ Logging by default is to stderr or stdout depending on the logging level of
@@ -57,7 +57,7 @@ Logging by default is to stderr or stdout depending on the logging level of
the log entry. It ia possible to send the logging information to an
application logging call-back handler for processing by the application.
......@@ -35,7 +35,7 @@ index 7e4344a..d5629fb 100644
Logging levels (*coap_log_t*) are defined by (the same as for *syslog*()), which
diff --git a/src/net.c b/src/net.c
index 635a848..2710e5d 100644
index 2d84a8b..b1867de 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1857,7 +1857,7 @@ no_response(coap_pdu_t *request, coap_pdu_t *response) {
......
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 24 Nov 2018 08:46:05 +0100
Subject: spelling: fix outputing -> outputting
---
man/coap_logging.txt.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/coap_logging.txt.in b/man/coap_logging.txt.in
index d5629fb..c1d5b8a 100644
--- a/man/coap_logging.txt.in
+++ b/man/coap_logging.txt.in
@@ -119,7 +119,7 @@ The *coap_set_show_pdu_output*() function defines whether the output from
*coap_log*(). _use_fprintf_ is set to 1 for stdout/stderr (the default), and
_use_fprintf_ is set to 0 for *coap_log*().
-The *coap_show_pdu*() function is used to decode the _pdu_, outputing as
+The *coap_show_pdu*() function is used to decode the _pdu_, outputting as
appropriate for logging _level_. Where the output goes is dependent on
*coap_set_show_pdu_output*().
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 24 Nov 2018 08:51:48 +0100
Subject: spelling: fix seperate -> separate
---
include/coap2/debug.h | 2 +-
include/coap2/resource.h | 2 +-
man/coap_recovery.txt.in | 2 +-
src/net.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/coap2/debug.h b/include/coap2/debug.h
index fe61e46..bcc01df 100644
--- a/include/coap2/debug.h
+++ b/include/coap2/debug.h
@@ -169,7 +169,7 @@ size_t coap_print_addr(const struct coap_address_t *address,
* Percentage : 0% to 100%. Use the specified probability.
* 0% is send all packets, 100% is drop all packets.
*
- * List: A comma seperated list of numbers or number ranges that are the
+ * List: A comma separated list of numbers or number ranges that are the
* packets to drop.
*
* @param loss_level The defined loss level (percentage or list).
diff --git a/include/coap2/resource.h b/include/coap2/resource.h
index 56c3fb6..d5ab8f3 100644
--- a/include/coap2/resource.h
+++ b/include/coap2/resource.h
@@ -161,7 +161,7 @@ coap_resource_t *coap_resource_init(coap_str_const_t *uri_path,
* a new one overrides the previous definition.
*
* Note: It is not possible to observe the unknown resource with a GET request
- * - a seperate resource needs to be reated by the PUT (or POST) handler,
+ * - a separate resource needs to be reated by the PUT (or POST) handler,
* and make that resource observable.
*
* This function returns the new coap_resource_t object.
diff --git a/man/coap_recovery.txt.in b/man/coap_recovery.txt.in
index a9a7362..62ac07c 100644
--- a/man/coap_recovery.txt.in
+++ b/man/coap_recovery.txt.in
@@ -77,7 +77,7 @@ but at that point COAP_NACK_TOO_MANY_RETRIES gets raised in the nack_handler
(if defined). Note that the sum of the seconds is 93 matching RFC7252.
----
-It should be noted that these retries are seperate from the DTLS or TLS
+It should be noted that these retries are separate from the DTLS or TLS
encrypted session setup retry timeouts. For DTLS, the initial requesting
packet will get sent max_retransmit times before reporting failure.
For TLS the initial TCP connection will timeout before reporting failure.
diff --git a/src/net.c b/src/net.c
index 2710e5d..902a797 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1943,7 +1943,7 @@ handle_request(coap_context_t *context, coap_session_t *session, coap_pdu_t *pdu
* coap_register_handler(r, COAP_REQUEST_DELETE, hnd_delete_unknown);
* coap_add_resource(ctx, r);
*
- * Note: It is not possible to observe the unknown_resource, a seperate
+ * Note: It is not possible to observe the unknown_resource, a separate
* resource must be created (by PUT or POST) which has a GET
* handler to be observed
*/
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 24 Nov 2018 08:49:36 +0100
Subject: spelling: fix whith -> with
---
man/coap_pdu_setup.txt.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/man/coap_pdu_setup.txt.in b/man/coap_pdu_setup.txt.in
index da7414b..9796ba0 100644
--- a/man/coap_pdu_setup.txt.in
+++ b/man/coap_pdu_setup.txt.in
@@ -196,12 +196,12 @@ the sizeof(int) bytes unless you definitely know less space is required.
The *coap_split_path*() function splits up _path_ of length _length_ and
places the result in _buffer_ which has a size of _buflen_. _buflen_ needs
to be preset with the size of _buffer_ before the function call, and then
-_buflen_ is updated whith the actual size of _buffer_ used.
+_buflen_ is updated with the actual size of _buffer_ used.
The *coap_split_query*() function splits up _query_ of length _length_ and
places the result in _buffer_ which has a size of _buflen_. _buflen_ needs
to be preset with the size of _buffer_ before the function call, and then
-_buflen_ is updated whith the actual size of _buffer_ used.
+_buflen_ is updated with the actual size of _buffer_ used.
RETURN VALUES
-------------
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment