Skip to content

fixing issue 49 #87

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

Open
summerliu-usf wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fixing issue 49 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ CoinMsg__Envelope *recv_envelope(int fd);
void send_registration_reply(int fd, bool ok);
void send_task_reply(int fd, char *block, uint32_t difficulty_mask, uint64_t sequence_num);
void send_verification_reply(int fd, bool ok, char *diagnostic);

ssize_t write_envelope(int fd, const CoinMsg__Envelope *envelope);
#endif
37 changes: 31 additions & 6 deletions server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,22 @@ void handle_heartbeat(int fd, CoinMsg__Heartbeat *hb, struct client_info *user)
LOG("[HEARTBEAT] User: %s\n", user->username);

if (validate_heartbeat(user) == false) {
//TODO: send empty task to indicate failure
LOG("%s", "[HEARTBEAT] User verification failed, sending empty response\n");

send_task_reply(fd, "", 0, 0);
return;
}

user->heartbeat_timestamp = time(NULL);

// TODO: send a heartbeat reply with the next sequence number.
// Old code follows:
// wrapper.heartbeat_reply.sequence_num = current_task->sequence_num;
CoinMsg__HeartbeatReply reply = COIN_MSG__HEARTBEAT_REPLY__INIT;
reply.sequence_num = current_task.sequence_num;
CoinMsg__Envelope envelope = COIN_MSG__ENVELOPE__INIT;
envelope.heartbeat_reply = &reply;
envelope.body_case = COIN_MSG__ENVELOPE__BODY_HEARTBEAT_REPLY;

LOG("[HEARTBEAT] Sent heartbeat reply to %s: seq=%lu\n", user->username, current_task.sequence_num);
write_envelope(fd, &envelope);
}

void handle_request_task(int fd, CoinMsg__TaskRequest *req, struct client_info *user)
Expand All @@ -175,8 +182,8 @@ bool verify_solution(struct CoinMsg__VerificationRequest *solution)
const char *check_format = "%s%lu";
ssize_t buf_sz = snprintf(NULL, 0, check_format, current_task.block, solution->nonce);
char *buf = malloc(buf_sz + 1);
if(buf == NULL){
perror("malloc");
if (buf == NULL){
perror("malloc failed");
return false;
}

Expand Down Expand Up @@ -256,7 +263,18 @@ struct client_info *handle_registration(int fd, CoinMsg__RegistrationRequest *re
bool success = user_register(req->username);
if (success == true) {
new_user = calloc(1, sizeof(struct client_info));
if (new_user == NULL) {
LOG("%s", "Failed to allocate memory for user\n");
send_registration_reply(fd, false);
return NULL;
}
new_user->username = strdup(req->username);
if (new_user->username == NULL) {
LOG("%s", "strdup failed for username \n");
free(new_user);
send_registration_reply(fd, false);
return NULL;
}
} else {
LOG("User already exists: %s\n", req->username);
}
Expand All @@ -279,14 +297,21 @@ void *client_thread(void* client_fd) {
switch (envelope->body_case) {
case COIN_MSG__ENVELOPE__BODY_REGISTRATION_REQUEST:
this_user = handle_registration(fd, envelope->registration_request);
if (this_user == NULL) {
LOG("%s", "ERROR: Registration failed, closing client... \n");
break;
}
break;
case COIN_MSG__ENVELOPE__BODY_TASK_REQUEST:
if (!this_user) break;
handle_request_task(fd, envelope->task_request, this_user);
break;
case COIN_MSG__ENVELOPE__BODY_VERIFICATION_REQUEST:
if (!this_user) break;
handle_verification(fd, envelope->verification_request, this_user);
break;
case COIN_MSG__ENVELOPE__BODY_HEARTBEAT:
if (!this_user) break;
handle_heartbeat(fd, envelope->heartbeat, this_user);
break;

Expand Down