Merge branch 'x-forwarded-for-lws' of https://github.com/hardillb/mos…

…quitto into hardillb-x-forwarded-for-lws
Beckhoff · Aug 16, 2022 · 4a65705 · 4a65705
2 parents 9d9469c + 0eec37a
commit 4a65705
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/websockets.c b/src/websockets.c
@@ -133,6 +133,7 @@ static int callback_mqtt(
  uint8_t *buf;
  int rc;
  uint8_t byte;
+ char ip_addr_buff[1024];
 
  switch (reason) {
  case LWS_CALLBACK_ESTABLISHED:
@@ -157,7 +158,12 @@ static int callback_mqtt(
  }else{
  return -1;
  }
- easy_address(lws_get_socket_fd(wsi), mosq);
+
+ if (lws_hdr_copy(wsi, ip_addr_buff, sizeof(ip_addr_buff), WSI_TOKEN_X_FORWARDED_FOR) > 0) {
+ mosq->address = mosquitto__strdup(ip_addr_buff);
+ } else {
+ easy_address(lws_get_socket_fd(wsi), mosq);
+ }
  if(!mosq->address){
  /* getpeername and inet_ntop failed and not a bridge */
  mosquitto__free(mosq);