Get rid of debug fprintfs on the network side of code
This commit is contained in:
parent
98f52fba51
commit
40048618ee
1 changed files with 6 additions and 14 deletions
20
ethermess.c
20
ethermess.c
|
@ -370,7 +370,6 @@ bool check_padding(const unsigned char *data, size_t index, size_t data_length)
|
||||||
void handle_status(const unsigned char source_mac[6], const unsigned char *data, size_t data_length) {
|
void handle_status(const unsigned char source_mac[6], const unsigned char *data, size_t data_length) {
|
||||||
if (data_length < 2) {
|
if (data_length < 2) {
|
||||||
// Too short
|
// Too short
|
||||||
fprintf(stderr, "Data too short: %zu\n", data_length); // debg
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -378,7 +377,6 @@ void handle_status(const unsigned char source_mac[6], const unsigned char *data,
|
||||||
|
|
||||||
if (status != EMS_AVAILABLE && status != EMS_UNAVAILABLE && status != EMS_OFFLINE) {
|
if (status != EMS_AVAILABLE && status != EMS_UNAVAILABLE && status != EMS_OFFLINE) {
|
||||||
// Unknown status, throw away
|
// Unknown status, throw away
|
||||||
fprintf(stderr, "Unknown status %u\n", status); // debg
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -386,7 +384,6 @@ void handle_status(const unsigned char source_mac[6], const unsigned char *data,
|
||||||
|
|
||||||
if (nick_length > data_length - 2) {
|
if (nick_length > data_length - 2) {
|
||||||
// Malformed length field
|
// Malformed length field
|
||||||
fprintf(stderr, "Nick length %u, remaining packet length %zu\n", nick_length, data_length); // debg
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -435,7 +432,6 @@ void handle_status(const unsigned char source_mac[6], const unsigned char *data,
|
||||||
void handle_msgid(const unsigned char source_mac[6], const unsigned char *data, size_t data_length) {
|
void handle_msgid(const unsigned char source_mac[6], const unsigned char *data, size_t data_length) {
|
||||||
if (data_length < 2) {
|
if (data_length < 2) {
|
||||||
// Too short
|
// Too short
|
||||||
fprintf(stderr, "Data too short: %zu\n", data_length); // debg
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -480,7 +476,6 @@ void handle_msgid(const unsigned char source_mac[6], const unsigned char *data,
|
||||||
void handle_message(const unsigned char source_mac[6], const unsigned char *data, size_t data_length) {
|
void handle_message(const unsigned char source_mac[6], const unsigned char *data, size_t data_length) {
|
||||||
if (data_length < 4) {
|
if (data_length < 4) {
|
||||||
// Too short
|
// Too short
|
||||||
fprintf(stderr, "Data too short: %zu\n", data_length); // debg
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -490,7 +485,6 @@ void handle_message(const unsigned char source_mac[6], const unsigned char *data
|
||||||
|
|
||||||
if (message_length > data_length - 4 || message_length > EM_MESSAGE_MAX_LENGTH) {
|
if (message_length > data_length - 4 || message_length > EM_MESSAGE_MAX_LENGTH) {
|
||||||
// Malformed length field
|
// Malformed length field
|
||||||
fprintf(stderr, "Message length %u, remaining packet length %zu, max message length %u\n", message_length, data_length, EM_MESSAGE_MAX_LENGTH); // debg
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -569,7 +563,6 @@ void handle_message(const unsigned char source_mac[6], const unsigned char *data
|
||||||
void handle_ack(const unsigned char source_mac[6], const unsigned char *data, size_t data_length) {
|
void handle_ack(const unsigned char source_mac[6], const unsigned char *data, size_t data_length) {
|
||||||
if (data_length < 2) {
|
if (data_length < 2) {
|
||||||
// Too short
|
// Too short
|
||||||
fprintf(stderr, "Data too short: %zu\n", data_length); // debg
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -611,10 +604,8 @@ void process_frame(void) {
|
||||||
|
|
||||||
if (memcmp(frame, own_mac, 6) == 0) {
|
if (memcmp(frame, own_mac, 6) == 0) {
|
||||||
// Targetted at us
|
// Targetted at us
|
||||||
fprintf(stderr, "."); // debg
|
|
||||||
} else if (memcmp(frame, broadcast_mac, 6) == 0) {
|
} else if (memcmp(frame, broadcast_mac, 6) == 0) {
|
||||||
// Broadcast
|
// Broadcast
|
||||||
fprintf(stderr, "^"); // debg
|
|
||||||
} else {
|
} else {
|
||||||
// Does not concern us
|
// Does not concern us
|
||||||
return;
|
return;
|
||||||
|
@ -629,7 +620,6 @@ void process_frame(void) {
|
||||||
|
|
||||||
// If they speak a version we don't understand, tell them to speak ours
|
// If they speak a version we don't understand, tell them to speak ours
|
||||||
if (version > EM_PROTOCOL_VERSION) {
|
if (version > EM_PROTOCOL_VERSION) {
|
||||||
fprintf(stderr, "Protocol version mismatch: %u\n", version); // debg
|
|
||||||
send_speak_version(source_mac);
|
send_speak_version(source_mac);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -666,9 +656,6 @@ void process_frame(void) {
|
||||||
case EMT_ACK:
|
case EMT_ACK:
|
||||||
handle_ack(source_mac, &frame[16], packet_length - 16);
|
handle_ack(source_mac, &frame[16], packet_length - 16);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
fprintf(stderr, "Ignoring packet of type %i\n", packet_type);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -869,7 +856,12 @@ int main(int argc, char **argv) {
|
||||||
// Print it out
|
// Print it out
|
||||||
char own_mac_str[18];
|
char own_mac_str[18];
|
||||||
format_mac(own_mac, own_mac_str);
|
format_mac(own_mac, own_mac_str);
|
||||||
fprintf(stderr, "%s\n", own_mac_str);
|
if (printf("%s\n", own_mac_str) == -1) {
|
||||||
|
err(1, "printf");
|
||||||
|
}
|
||||||
|
if (fflush(stdout) == EOF) {
|
||||||
|
err(1, "fflush");
|
||||||
|
}
|
||||||
|
|
||||||
// Set our nick
|
// Set our nick
|
||||||
if (memcmp(own_mac, veth0a_mac, 6) == 0) {
|
if (memcmp(own_mac, veth0a_mac, 6) == 0) {
|
||||||
|
|
Loading…
Reference in a new issue