Skip to contentSkip to conversation

mosquitto: unbreak build with websockets and !libopenssl

PATCH New Peter Korsgaard 2 participants 6 messages Mar 3, 2018 – Apr 10, 2018

lore
Share & tools
lore

Peter Korsgaard

author
#0 lore raw

PATCH 1/1 mosquitto: unbreak build with websockets and !libopenssl

Fixes:
http://autobuild.buildroot.net/results/d69/d693f3e3f1c73ccf54ac7076623e436355a9d901/b

Signed-off-by Peter Korsgaard <[email protected]>
---
 ...01-websockets.c-unbreak-build-without-TLS.patch | 49 ++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 package/mosquitto/0001-websockets.c-unbreak-build-without-TLS.patch
package/mosquitto/0001-websockets.c-unbreak-build-without-TLS.patch new file +49 -0
new file mode 100644
index 0000000000..e977fae56c
@@ -0,0 +1,49 @@
+From 4822aa97da80a86033ec6e4a8b2f4ad0911235cf Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <[email protected]>
+Date: Sat, 3 Mar 2018 11:04:47 +0100
+Subject: [PATCH] websockets.c: unbreak build without TLS
+
+Commit 7943072b1f3b (Fix use_identity_as_username not working on websockets
+clients) added code which unconditionally accesses mosq-ssl, breaking the
+build when TLS support is disabled.
+
+Fix it by guarding this logic inside #ifdef WITH_TLS.
+
+[Upstream: https://dev.eclipse.org/mhonarc/lists/mosquitto-dev/msg01813.html]
+Signed-off-by: Peter Korsgaard <[email protected]>
+---
+ src/websockets.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/websockets.c b/src/websockets.c
+index d4d7961..a796f0a 100644
+--- a/src/websockets.c
++++ b/src/websockets.c
+@@ -201,12 +201,14 @@ static int callback_mqtt(struct libwebsocket_context *context,
+ 				mosq->ws_context = context;
+ #endif
+ 				mosq->wsi = wsi;
++#ifdef WITH_TLS
+ 				if(in){
+ 					mosq->ssl = (SSL *)in;
+ 					if(!mosq->listener->ssl_ctx){
+ 						mosq->listener->ssl_ctx = SSL_get_SSL_CTX(mosq->ssl);
+ 					}
+ 				}
++#endif
+ 				u->mosq = mosq;
+ 			}else{
+ 				return -1;
+@@ -240,7 +242,9 @@ static int callback_mqtt(struct libwebsocket_context *context,
+ 					mosq->pollfd_index = -1;
+ 				}
+ 				mosq->wsi = NULL;
++#ifdef WITH_TLS
+ 				mosq->ssl = NULL;
++#endif
+ 				do_disconnect(db, mosq);
+ 			}
+ 			break;
+-- 
+2.11.0
+
Signature · 1 line
2.11.0
#2 lore raw

PATCH 1/1 mosquitto: unbreak build with websockets and !libopenssl

Hello Peter,

Quoted 8 lines · Peter Korsgaard
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

Fixes:
http://autobuild.buildroot.net/results/d69/d693f3e3f1c73ccf54ac7076623e436355a9d901/b

Signed-off-by Peter Korsgaard <[email protected]>

Committed, thanks.

Do you thank yourself here? Doesn't that somehow circumvent a probably desired review?

Curious.
Alex

Signature · 11 lines
?With the first link, the chain is forged. The first speech censured, 
the first thought forbidden, the first freedom denied, chains us all 
irrevocably.? (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: C28E E6B9 0263 95CF 8FAF  08FA 34AD CD00 7221 5CC6 ***
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180305/e5e3ae5a/attachment.asc>
author
#3 lore raw

PATCH 1/1 mosquitto: unbreak build with websockets and !libopenssl

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Alexander" == Alexander Dahl <[email protected]> writes:

Hello Peter,

Quoted 5 lines · Peter Korsgaard
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

Fixes:
http://autobuild.buildroot.net/results/d69/d693f3e3f1c73ccf54ac7076623e436355a9d901/b

Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Peter Korsgaard <[email protected]>

Committed, thanks.

Do you thank yourself here? Doesn't that somehow circumvent a probably desired review?

It would certainly be nicer if other people would review the patch, but given how obvious it is and how close we were to the release I opted to apply it myself.

Are you interested in mosquitto? If so, please add an entry to DEVELOPERS for it and I'll ensure I CC you on future patches to it.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/1 mosquitto: unbreak build with websockets and !libopenssl

Hello Peter,

Quoted 3 lines · Peter Korsgaard

It would certainly be nicer if other people would review the patch, but given how obvious it is and how close we were to the release I opted to apply it myself.

Understood.

Quoted 2 lines

Are you interested in mosquitto? If so, please add an entry to DEVELOPERS for it and I'll ensure I CC you on future patches to it.

In general I'm interested in mosquitto, I added a package for ptxdist
[1] last year, which is a requirement for a mosquitto based mqtt-library [2] I'm working on in my spare time, but currently I have no usecase to use it with buildroot. Maybe later, if I decide it would be useful on the fli4l [3] router in the hackerspace I'm member of. I can send a patch to add myself then. O:-)

Have a nice day.
Alex

[1] https://git.pengutronix.de/cgit/ptxdist/commit/?id=8201e3d29e950e713f755ec4e864ce0869bdd060
[2] https://github.com/penguineer/mqtt-tools
[3] https://www.fli4l.de/

Signature · 11 lines
?With the first link, the chain is forged. The first speech censured, 
the first thought forbidden, the first freedom denied, chains us all 
irrevocably.? (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: C28E E6B9 0263 95CF 8FAF  08FA 34AD CD00 7221 5CC6 ***
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180305/e7dcd57c/attachment.asc>