Merge quashing of compile warnings
This commit is contained in:
commit
fd35174928
6 changed files with 9 additions and 9 deletions
|
@ -358,7 +358,7 @@ read_from_socket(void *anything)
|
||||||
int status;
|
int status;
|
||||||
ReceiveBuffer msg;
|
ReceiveBuffer msg;
|
||||||
struct sockaddr_in his_addr;
|
struct sockaddr_in his_addr;
|
||||||
int his_addr_len;
|
socklen_t his_addr_len;
|
||||||
int flags;
|
int flags;
|
||||||
int message_length;
|
int message_length;
|
||||||
unsigned long remote_ip;
|
unsigned long remote_ip;
|
||||||
|
|
6
client.c
6
client.c
|
@ -146,7 +146,7 @@ read_line(void)
|
||||||
static unsigned long
|
static unsigned long
|
||||||
get_address(const char *hostname)
|
get_address(const char *hostname)
|
||||||
{
|
{
|
||||||
unsigned char *address0;
|
char *address0;
|
||||||
struct hostent *host;
|
struct hostent *host;
|
||||||
unsigned long result;
|
unsigned long result;
|
||||||
|
|
||||||
|
@ -746,7 +746,7 @@ static int
|
||||||
accheck_getaddr(char *line, unsigned long *addr)
|
accheck_getaddr(char *line, unsigned long *addr)
|
||||||
{
|
{
|
||||||
unsigned long a, b, c, d, ip;
|
unsigned long a, b, c, d, ip;
|
||||||
unsigned char *p, *q;
|
char *p, *q;
|
||||||
p = line;
|
p = line;
|
||||||
while (*p && isspace(*p)) p++;
|
while (*p && isspace(*p)) p++;
|
||||||
if (!*p) {
|
if (!*p) {
|
||||||
|
@ -1124,7 +1124,7 @@ static int
|
||||||
submit_request(CMD_Request *request, CMD_Reply *reply, int *reply_auth_ok)
|
submit_request(CMD_Request *request, CMD_Reply *reply, int *reply_auth_ok)
|
||||||
{
|
{
|
||||||
unsigned long tx_sequence;
|
unsigned long tx_sequence;
|
||||||
int where_from_len;
|
socklen_t where_from_len;
|
||||||
struct sockaddr_in where_from;
|
struct sockaddr_in where_from;
|
||||||
int bad_length, bad_sender, bad_sequence, bad_header;
|
int bad_length, bad_sender, bad_sequence, bad_header;
|
||||||
int select_status;
|
int select_status;
|
||||||
|
|
2
cmdmon.c
2
cmdmon.c
|
@ -1584,7 +1584,7 @@ read_from_cmd_socket(void *anything)
|
||||||
CMD_Reply tx_message, *prev_tx_message;
|
CMD_Reply tx_message, *prev_tx_message;
|
||||||
int rx_message_length, tx_message_length;
|
int rx_message_length, tx_message_length;
|
||||||
struct sockaddr_in where_from;
|
struct sockaddr_in where_from;
|
||||||
int from_length;
|
socklen_t from_length;
|
||||||
unsigned long remote_ip;
|
unsigned long remote_ip;
|
||||||
unsigned short remote_port;
|
unsigned short remote_port;
|
||||||
int md5_ok;
|
int md5_ok;
|
||||||
|
|
|
@ -39,7 +39,7 @@ unsigned long
|
||||||
DNS_Name2IPAddress(const char *name)
|
DNS_Name2IPAddress(const char *name)
|
||||||
{
|
{
|
||||||
struct hostent *host;
|
struct hostent *host;
|
||||||
unsigned char *address0;
|
char *address0;
|
||||||
unsigned long result;
|
unsigned long result;
|
||||||
|
|
||||||
host = gethostbyname(name);
|
host = gethostbyname(name);
|
||||||
|
|
|
@ -378,7 +378,7 @@ generate_packet_auth(NTP_Packet *pkt, unsigned long keyid)
|
||||||
if (keyok) {
|
if (keyok) {
|
||||||
pkt->auth_keyid = htonl(keyid);
|
pkt->auth_keyid = htonl(keyid);
|
||||||
MD5Init(&ctx);
|
MD5Init(&ctx);
|
||||||
MD5Update(&ctx, keytext, keylen);
|
MD5Update(&ctx, (unsigned char *) keytext, keylen);
|
||||||
MD5Update(&ctx, (unsigned char *) pkt, offsetof(NTP_Packet, auth_keyid));
|
MD5Update(&ctx, (unsigned char *) pkt, offsetof(NTP_Packet, auth_keyid));
|
||||||
MD5Final(&ctx);
|
MD5Final(&ctx);
|
||||||
memcpy(&(pkt->auth_data), &ctx.digest, 16);
|
memcpy(&(pkt->auth_data), &ctx.digest, 16);
|
||||||
|
@ -447,7 +447,7 @@ check_packet_auth(NTP_Packet *pkt, unsigned long keyid)
|
||||||
if (keyok) {
|
if (keyok) {
|
||||||
pkt->auth_keyid = htonl(keyid);
|
pkt->auth_keyid = htonl(keyid);
|
||||||
MD5Init(&ctx);
|
MD5Init(&ctx);
|
||||||
MD5Update(&ctx, keytext, keylen);
|
MD5Update(&ctx, (unsigned char *) keytext, keylen);
|
||||||
MD5Update(&ctx, (unsigned char *) pkt, offsetof(NTP_Packet, auth_keyid));
|
MD5Update(&ctx, (unsigned char *) pkt, offsetof(NTP_Packet, auth_keyid));
|
||||||
MD5Final(&ctx);
|
MD5Final(&ctx);
|
||||||
if (!memcmp((void *) &ctx.digest, (void *) &(pkt->auth_data), 16)) {
|
if (!memcmp((void *) &ctx.digest, (void *) &(pkt->auth_data), 16)) {
|
||||||
|
|
2
ntp_io.c
2
ntp_io.c
|
@ -184,7 +184,7 @@ read_from_socket(void *anything)
|
||||||
ReceiveBuffer message;
|
ReceiveBuffer message;
|
||||||
int message_length;
|
int message_length;
|
||||||
struct sockaddr_in where_from;
|
struct sockaddr_in where_from;
|
||||||
int from_length;
|
socklen_t from_length;
|
||||||
unsigned int flags = 0;
|
unsigned int flags = 0;
|
||||||
struct timeval now;
|
struct timeval now;
|
||||||
NTP_Remote_Address remote_addr;
|
NTP_Remote_Address remote_addr;
|
||||||
|
|
Loading…
Reference in a new issue