DWS/chrony
1
0
Fork 0
mirror of https://gitlab.com/chrony/chrony.git synced 2025-12-03 15:45:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmdmon: drop handling of NULL and LOGON requests

Browse Source 
Handle the NULL and LOGON requests as unknown (invalid) instead of
returning the success and failed status respectively. They have
been unused for very long time now.
This commit is contained in:
Miroslav Lichvar
2025-02-10 15:08:03 +01:00
parent 3dea7dd723
commit 9ba6e7655c
3 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
candm.h
View File

@@ -37,7 +37,6 @@
#define DEFAULT_CANDM_PORT 323 #define DEFAULT_CANDM_PORT 323
/* Request codes */ /* Request codes */
#define REQ_NULL 0
#define REQ_ONLINE 1 #define REQ_ONLINE 1
#define REQ_OFFLINE 2 #define REQ_OFFLINE 2
#define REQ_BURST 3 #define REQ_BURST 3
@@ -223,11 +222,6 @@ typedef struct {
int32_t EOR; int32_t EOR;
} REQ_Modify_Makestep; } REQ_Modify_Makestep;
typedef struct {
Timespec ts;
int32_t EOR;
} REQ_Logon;
typedef struct { typedef struct {
Timespec ts; Timespec ts;
int32_t EOR; int32_t EOR;
@@ -487,7 +481,6 @@ typedef struct {
REQ_Modify_Polltarget modify_polltarget; REQ_Modify_Polltarget modify_polltarget;
REQ_Modify_Maxupdateskew modify_maxupdateskew; REQ_Modify_Maxupdateskew modify_maxupdateskew;
REQ_Modify_Makestep modify_makestep; REQ_Modify_Makestep modify_makestep;
REQ_Logon logon;
REQ_Settime settime; REQ_Settime settime;
REQ_Local local; REQ_Local local;
REQ_Manual manual; REQ_Manual manual;

9
cmdmon.c
View File

@@ -1595,10 +1595,6 @@ read_from_cmd_socket(int sock_fd, int event, void *anything)
LOG_SetContext(LOGC_Command); LOG_SetContext(LOGC_Command);
switch(rx_command) { switch(rx_command) {
case REQ_NULL:
/* Do nothing */
break;
case REQ_DUMP: case REQ_DUMP:
handle_dump(&rx_message, &tx_message); handle_dump(&rx_message, &tx_message);
break; break;
@@ -1643,11 +1639,6 @@ read_from_cmd_socket(int sock_fd, int event, void *anything)
handle_modify_makestep(&rx_message, &tx_message); handle_modify_makestep(&rx_message, &tx_message);
break; break;
case REQ_LOGON:
/* Authentication is no longer supported, log-on always fails */
tx_message.status = htons(STT_FAILED);
break;
case REQ_SETTIME: case REQ_SETTIME:
handle_settime(&rx_message, &tx_message); handle_settime(&rx_message, &tx_message);
break; break;

4
pktlength.c
View File

@@ -55,7 +55,7 @@ struct request_length {
}; };
static const struct request_length request_lengths[] = { static const struct request_length request_lengths[] = {
REQ_LENGTH_ENTRY(null, null), /* NULL */ { 0, 0 }, /* NULL - not supported */
REQ_LENGTH_ENTRY(online, null), /* ONLINE */ REQ_LENGTH_ENTRY(online, null), /* ONLINE */
REQ_LENGTH_ENTRY(offline, null), /* OFFLINE */ REQ_LENGTH_ENTRY(offline, null), /* OFFLINE */
REQ_LENGTH_ENTRY(burst, null), /* BURST */ REQ_LENGTH_ENTRY(burst, null), /* BURST */
@@ -65,7 +65,7 @@ static const struct request_length request_lengths[] = {
REQ_LENGTH_ENTRY(modify_maxdelay, null), /* MODIFY_MAXDELAY */ REQ_LENGTH_ENTRY(modify_maxdelay, null), /* MODIFY_MAXDELAY */
REQ_LENGTH_ENTRY(modify_maxdelayratio, null), /* MODIFY_MAXDELAYRATIO */ REQ_LENGTH_ENTRY(modify_maxdelayratio, null), /* MODIFY_MAXDELAYRATIO */
REQ_LENGTH_ENTRY(modify_maxupdateskew, null), /* MODIFY_MAXUPDATESKEW */ REQ_LENGTH_ENTRY(modify_maxupdateskew, null), /* MODIFY_MAXUPDATESKEW */
REQ_LENGTH_ENTRY(logon, null), /* LOGON */ { 0, 0 }, /* LOGON - not supported */
REQ_LENGTH_ENTRY(settime, manual_timestamp), /* SETTIME */ REQ_LENGTH_ENTRY(settime, manual_timestamp), /* SETTIME */
{ 0, 0 }, /* LOCAL */ { 0, 0 }, /* LOCAL */
REQ_LENGTH_ENTRY(manual, null), /* MANUAL */ REQ_LENGTH_ENTRY(manual, null), /* MANUAL */