Skip to content

Remove MQTT telemetry subsystem #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgrossmann merged 3 commits into from
Apr 8, 2026
Merged

Remove MQTT telemetry subsystem #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfb102f
Remove MQTT telemetry subsystem
mgrossmann Apr 8, 2026
ccf0ddb
Remove MQTT code from Lua publish binding
mgrossmann Apr 8, 2026
bed8e61
fix: remove remaining http_pubf calls and fix HTTPLUAX macro in publi…
mgrossmann Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions include/httpcgi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ typedef struct cred CRED; /* Credentials — opaque */
typedef struct ufs UFS; /* UFS filesystem — opaque */
typedef struct ufsfile UFSFILE; /* UFS file handle — opaque */
#endif
typedef struct mqtc MQTC; /* MQTT client — opaque */
typedef struct cib CIB; /* Console info block — opaque */
#include <socket.h> /* struct in_addr */

Expand Down Expand Up @@ -286,10 +285,7 @@ struct httpx {
/* 104 add cgi for pgm and path */
int (*http_process_cgi)(HTTPC *httpc, HTTPCGI *cgi);
/* 108 process CGI request */
int (*mqtc_pub)(MQTC *mqtc, unsigned qos, unsigned retain,
const char *topic_name,
const char *application_message);
/* 10C publish MQTT topic */
void *unused_10C; /* 10C (was: mqtc_pub) */
unsigned char *(*http_xlate)(unsigned char *, int, const unsigned char *);
/* 110 translate with explicit table */
HTTPCP *xlate_cp037; /* 114 CP037 codepage pair */
Expand Down Expand Up @@ -515,9 +511,6 @@ struct httpx {
#define http_process_cgi(httpc,cgi) \
((httpx->http_process_cgi)((httpc),(cgi)))

#define mqtc_pub(mqtc,qos,retain,topic,message) \
((httpx->mqtc_pub)((mqtc),(qos),(retain),(topic),(message)))

#define http_xlate(buf,len,tbl) \
((httpx->http_xlate)((buf),(len),(tbl)))

Expand Down
44 changes: 2 additions & 42 deletions include/httpd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
#include "racf.h" /* security environment */
#include "types.h" /* UCHAR, USHRT, UINT, ULONG */
#include "cred.h" /* Credentials */
#include "mqtc370.h" /* MQTT Client */
#include "httpxlat.h" /* ASCII/EBCDIC translation */

#define HTTPLUAX (httpd->luax) /* use this pointer */
Expand All @@ -52,17 +51,13 @@
typedef struct httpd HTTPD; /* HTTP Daemon (server) */
typedef struct httpc HTTPC; /* HTTP Client */
typedef struct httpm HTTPM; /* HTTP Mime */
typedef struct httpt HTTPT; /* HTTP Telemetry (MQTT) */
typedef struct httptc HTTPTC; /* HTTP Telemetry Cache */
typedef struct httpx HTTPX; /* HTTP function vector */
typedef struct httpv HTTPV; /* HTTP Variables */
typedef struct httpcgi HTTPCGI; /* HTTP CGI path and programs */
typedef struct httpstat HTTPSTAT; /* HTTP Statistics record */
typedef enum cstate CSTATE; /* HTTP Client state */
typedef enum rdw RDW; /* RDW option */

#include "httppub.h" /* HTTP Telemetry Publisher */

#ifndef OR
#define OR ??!??! /* logical OR trigraph */
#endif
Expand Down Expand Up @@ -140,7 +135,7 @@ struct httpd {
UCHAR *cgilua_path; /* 88 CGI Lua package.path */
UCHAR *cgilua_cpath; /* 8C CGI Lua package.cpath */
UFS *ufs; /* 90 Unix "like" File System */
HTTPT *httpt; /* 94 Telemetry (MQTT) */
void *unused_94; /* 94 (was: HTTPT *httpt) */
CTHDTASK *self; /* 98 HTTPD main thread */
void **cgictx; /* 9C array of CGI context ptrs */
#define HTTPD_CGICTX_MVSMF 0 /* ... MVSMF CGI context index */
Expand All @@ -152,37 +147,6 @@ struct httpd {
char codepage[16]; /* 124 codepage name */
}; /* 134 */

/* Telemetry */
struct httpt {
char eye[8]; /* 00 eye catcher */
#define HTTPT_EYE "*HTTPT*" /* ... */
MQTC *mqtc; /* 08 MQTT370 Client Handle */
unsigned flag; /* 0C Flags */
#define HTTPT_FLAG_START 0x80000000 /* ... start client */
#define HTTPT_FLAG_GMT 0x40000000 /* ... datetime values GMT */
char *broker_host; /* 10 config host name */
char *broker_port; /* 14 config port number */
char *prefix; /* 18 config topic prefix */
char *smfid; /* 1C smfid string */
char *jobname; /* 20 jobname string */
unsigned telemetry; /* 24 telemetry interval */
HTTPTC **httptc; /* 28 telemetry cache array */
CTHDTASK *telemetry_thread; /* 30 telemetry thread */
unsigned telemetry_ecb; /* 34 telemetry ecb */
unsigned unused[2]; /* 38 unused */
}; /* 40 (64 bytes) */

/* Telemetry Cache */
struct httptc {
char eye[8]; /* 00 eye catcher */
#define HTTPTC_EYE "*HTTPTC*" /* ,,, */
time64_t last; /* 08 last update time */
unsigned topic_len; /* 10 topic name length */
char *topic; /* 14 topic name */
unsigned data_len; /* 18 message data length */
char *data; /* 1C message data */
}; /* 20 (32 bytes) */

/* HTTP variables */
struct httpv {
char eye[8]; /* 00 eye catcher */
Expand Down Expand Up @@ -421,8 +385,7 @@ struct httpx {
/* 104 add cgi for pgm and path */
int (*http_process_cgi)(HTTPC *httpc, HTTPCGI *cgi);
/* 108 process CGI request */
int (*mqtc_pub)(MQTC *mqtc, unsigned qos, unsigned retain, const char* topic_name, const char* application_message);
/* 10C publish topic */
void *unused_10C; /* 10C (was: mqtc_pub) */
unsigned char *(*http_xlate)(unsigned char *, int, const unsigned char *);
/* 110 translate with explicit table */
HTTPCP *xlate_cp037; /* 114 CP037 codepage pair */
Expand Down Expand Up @@ -714,9 +677,6 @@ extern int http_gets(HTTPC *httpc, UCHAR *buf, unsigned max) asm("HTT
#define http_process_cgi(httpc,cgi) \
((httpx->http_process_cgi)((httpc),(cgi)))

#define mqtc_pub(mqtc,qos,retain,topic,message) \
((httpx->mqtc_pub)((mqtc),(qos),(retain),(topic),(message)))

#define http_xlate(buf,len,tbl) \
((httpx->http_xlate)((buf),(len),(tbl)))

Expand Down
48 changes: 0 additions & 48 deletions include/httppub.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ space = ["TRK", 150, 50, 30]
"mvslovers/crent370" = ">=1.0.8"
"mvslovers/ufsd" = "=1.0.0-dev"
"mvslovers/lua370" = ">=1.0.2"
"mvslovers/mqtt370" = ">=1.0.3"

# --- Load Modules ------------------------------------------------

Expand Down
Loading
Loading