diff --git a/lib/messages_mosq.c b/lib/messages_mosq.c index 37e4e2c3..36d3b913 100644 --- a/lib/messages_mosq.c +++ b/lib/messages_mosq.c @@ -25,7 +25,7 @@ Contributors: #include "send_mosq.h" #include "time_mosq.h" -void mosquitto__message_cleanup(struct mosquitto_message_all **message) +void message__cleanup(struct mosquitto_message_all **message) { struct mosquitto_message_all *msg; @@ -38,7 +38,7 @@ void mosquitto__message_cleanup(struct mosquitto_message_all **message) mosquitto__free(msg); } -void mosquitto__message_cleanup_all(struct mosquitto *mosq) +void message__cleanup_all(struct mosquitto *mosq) { struct mosquitto_message_all *tmp; @@ -46,12 +46,12 @@ void mosquitto__message_cleanup_all(struct mosquitto *mosq) while(mosq->in_messages){ tmp = mosq->in_messages->next; - mosquitto__message_cleanup(&mosq->in_messages); + message__cleanup(&mosq->in_messages); mosq->in_messages = tmp; } while(mosq->out_messages){ tmp = mosq->out_messages->next; - mosquitto__message_cleanup(&mosq->out_messages); + message__cleanup(&mosq->out_messages); mosq->out_messages = tmp; } } @@ -80,15 +80,15 @@ int mosquitto_message_copy(struct mosquitto_message *dst, const struct mosquitto return MOSQ_ERR_SUCCESS; } -int mosquitto__message_delete(struct mosquitto *mosq, uint16_t mid, enum mosquitto_msg_direction dir) +int message__delete(struct mosquitto *mosq, uint16_t mid, enum mosquitto_msg_direction dir) { struct mosquitto_message_all *message; int rc; assert(mosq); - rc = mosquitto__message_remove(mosq, mid, dir, &message); + rc = message__remove(mosq, mid, dir, &message); if(rc == MOSQ_ERR_SUCCESS){ - mosquitto__message_cleanup(&message); + message__cleanup(&message); } return rc; } @@ -106,7 +106,7 @@ void mosquitto_message_free(struct mosquitto_message **message) mosquitto__free(msg); } -void mosquitto__message_queue(struct mosquitto *mosq, struct mosquitto_message_all *message, enum mosquitto_msg_direction dir) +void message__queue(struct mosquitto *mosq, struct mosquitto_message_all *message, enum mosquitto_msg_direction dir) { /* mosq->*_message_mutex should be locked before entering this function */ assert(mosq); @@ -136,7 +136,7 @@ void mosquitto__message_queue(struct mosquitto *mosq, struct mosquitto_message_a } } -void mosquitto__messages_reconnect_reset(struct mosquitto *mosq) +void message__reconnect_reset(struct mosquitto *mosq) { struct mosquitto_message_all *message; struct mosquitto_message_all *prev = NULL; @@ -151,11 +151,11 @@ void mosquitto__messages_reconnect_reset(struct mosquitto *mosq) if(message->msg.qos != 2){ if(prev){ prev->next = message->next; - mosquitto__message_cleanup(&message); + message__cleanup(&message); message = prev; }else{ mosq->in_messages = message->next; - mosquitto__message_cleanup(&message); + message__cleanup(&message); message = mosq->in_messages; } }else{ @@ -196,7 +196,7 @@ void mosquitto__messages_reconnect_reset(struct mosquitto *mosq) pthread_mutex_unlock(&mosq->out_message_mutex); } -int mosquitto__message_remove(struct mosquitto *mosq, uint16_t mid, enum mosquitto_msg_direction dir, struct mosquitto_message_all **message) +int message__remove(struct mosquitto *mosq, uint16_t mid, enum mosquitto_msg_direction dir, struct mosquitto_message_all **message) { struct mosquitto_message_all *cur, *prev = NULL; bool found = false; @@ -294,9 +294,9 @@ int mosquitto__message_remove(struct mosquitto *mosq, uint16_t mid, enum mosquit } #ifdef WITH_THREADING -void mosquitto__message_retry_check_actual(struct mosquitto *mosq, struct mosquitto_message_all *messages, pthread_mutex_t *mutex) +void message__retry_check_actual(struct mosquitto *mosq, struct mosquitto_message_all *messages, pthread_mutex_t *mutex) #else -void mosquitto__message_retry_check_actual(struct mosquitto *mosq, struct mosquitto_message_all *messages) +void message__retry_check_actual(struct mosquitto *mosq, struct mosquitto_message_all *messages) #endif { time_t now = mosquitto_time(); @@ -336,14 +336,14 @@ void mosquitto__message_retry_check_actual(struct mosquitto *mosq, struct mosqui #endif } -void mosquitto__message_retry_check(struct mosquitto *mosq) +void message__retry_check(struct mosquitto *mosq) { #ifdef WITH_THREADING - mosquitto__message_retry_check_actual(mosq, mosq->out_messages, &mosq->out_message_mutex); - mosquitto__message_retry_check_actual(mosq, mosq->in_messages, &mosq->in_message_mutex); + message__retry_check_actual(mosq, mosq->out_messages, &mosq->out_message_mutex); + message__retry_check_actual(mosq, mosq->in_messages, &mosq->in_message_mutex); #else - mosquitto__message_retry_check_actual(mosq, mosq->out_messages); - mosquitto__message_retry_check_actual(mosq, mosq->in_messages); + message__retry_check_actual(mosq, mosq->out_messages); + message__retry_check_actual(mosq, mosq->in_messages); #endif } @@ -353,7 +353,7 @@ void mosquitto_message_retry_set(struct mosquitto *mosq, unsigned int message_re if(mosq) mosq->message_retry = message_retry; } -int mosquitto__message_out_update(struct mosquitto *mosq, uint16_t mid, enum mosquitto_msg_state state) +int message__out_update(struct mosquitto *mosq, uint16_t mid, enum mosquitto_msg_state state) { struct mosquitto_message_all *message; assert(mosq); diff --git a/lib/messages_mosq.h b/lib/messages_mosq.h index 48478205..39616a7e 100644 --- a/lib/messages_mosq.h +++ b/lib/messages_mosq.h @@ -19,13 +19,13 @@ Contributors: #include "mosquitto_internal.h" #include "mosquitto.h" -void mosquitto__message_cleanup_all(struct mosquitto *mosq); -void mosquitto__message_cleanup(struct mosquitto_message_all **message); -int mosquitto__message_delete(struct mosquitto *mosq, uint16_t mid, enum mosquitto_msg_direction dir); -void mosquitto__message_queue(struct mosquitto *mosq, struct mosquitto_message_all *message, enum mosquitto_msg_direction dir); -void mosquitto__messages_reconnect_reset(struct mosquitto *mosq); -int mosquitto__message_remove(struct mosquitto *mosq, uint16_t mid, enum mosquitto_msg_direction dir, struct mosquitto_message_all **message); -void mosquitto__message_retry_check(struct mosquitto *mosq); -int mosquitto__message_out_update(struct mosquitto *mosq, uint16_t mid, enum mosquitto_msg_state state); +void message__cleanup_all(struct mosquitto *mosq); +void message__cleanup(struct mosquitto_message_all **message); +int message__delete(struct mosquitto *mosq, uint16_t mid, enum mosquitto_msg_direction dir); +void message__queue(struct mosquitto *mosq, struct mosquitto_message_all *message, enum mosquitto_msg_direction dir); +void message__reconnect_reset(struct mosquitto *mosq); +int message__remove(struct mosquitto *mosq, uint16_t mid, enum mosquitto_msg_direction dir, struct mosquitto_message_all **message); +void message__retry_check(struct mosquitto *mosq); +int message__out_update(struct mosquitto *mosq, uint16_t mid, enum mosquitto_msg_state state); #endif diff --git a/lib/mosquitto.c b/lib/mosquitto.c index 1a227f7e..a0071503 100644 --- a/lib/mosquitto.c +++ b/lib/mosquitto.c @@ -299,7 +299,7 @@ void mosquitto__destroy(struct mosquitto *mosq) if(mosq->sock != INVALID_SOCKET){ mosquitto__socket_close(mosq); } - mosquitto__message_cleanup_all(mosq); + message__cleanup_all(mosq); mosquitto__will_clear(mosq); #ifdef WITH_TLS if(mosq->ssl){ @@ -506,7 +506,7 @@ static int mosquitto__reconnect(struct mosquitto *mosq, bool blocking) pthread_mutex_unlock(&mosq->out_packet_mutex); pthread_mutex_unlock(&mosq->current_out_packet_mutex); - mosquitto__messages_reconnect_reset(mosq); + message__reconnect_reset(mosq); #ifdef WITH_SOCKS if(mosq->socks5_host){ @@ -571,14 +571,14 @@ int mosquitto_publish(struct mosquitto *mosq, int *mid, const char *topic, int p message->msg.mid = local_mid; message->msg.topic = mosquitto__strdup(topic); if(!message->msg.topic){ - mosquitto__message_cleanup(&message); + message__cleanup(&message); return MOSQ_ERR_NOMEM; } if(payloadlen){ message->msg.payloadlen = payloadlen; message->msg.payload = mosquitto__malloc(payloadlen*sizeof(uint8_t)); if(!message->msg.payload){ - mosquitto__message_cleanup(&message); + message__cleanup(&message); return MOSQ_ERR_NOMEM; } memcpy(message->msg.payload, payload, payloadlen*sizeof(uint8_t)); @@ -591,7 +591,7 @@ int mosquitto_publish(struct mosquitto *mosq, int *mid, const char *topic, int p message->dup = false; pthread_mutex_lock(&mosq->out_message_mutex); - mosquitto__message_queue(mosq, message, mosq_md_out); + message__queue(mosq, message, mosq_md_out); if(mosq->max_inflight_messages == 0 || mosq->inflight_messages < mosq->max_inflight_messages){ mosq->inflight_messages++; if(qos == 1){ @@ -1061,7 +1061,7 @@ int mosquitto_loop_misc(struct mosquitto *mosq) mosquitto__check_keepalive(mosq); now = mosquitto_time(); if(mosq->last_retry_check+1 < now){ - mosquitto__message_retry_check(mosq); + message__retry_check(mosq); mosq->last_retry_check = now; } if(mosq->ping_t && now - mosq->ping_t >= mosq->keepalive){ diff --git a/lib/read_handle.c b/lib/read_handle.c index e0d22d6f..34477e14 100644 --- a/lib/read_handle.c +++ b/lib/read_handle.c @@ -82,18 +82,18 @@ int mosquitto__handle_publish(struct mosquitto *mosq) rc = packet__read_string(&mosq->in_packet, &message->msg.topic); if(rc){ - mosquitto__message_cleanup(&message); + message__cleanup(&message); return rc; } if(!strlen(message->msg.topic)){ - mosquitto__message_cleanup(&message); + message__cleanup(&message); return MOSQ_ERR_PROTOCOL; } if(message->msg.qos > 0){ rc = packet__read_uint16(&mosq->in_packet, &mid); if(rc){ - mosquitto__message_cleanup(&message); + message__cleanup(&message); return rc; } message->msg.mid = (int)mid; @@ -103,12 +103,12 @@ int mosquitto__handle_publish(struct mosquitto *mosq) if(message->msg.payloadlen){ message->msg.payload = mosquitto__calloc(message->msg.payloadlen+1, sizeof(uint8_t)); if(!message->msg.payload){ - mosquitto__message_cleanup(&message); + message__cleanup(&message); return MOSQ_ERR_NOMEM; } rc = packet__read_bytes(&mosq->in_packet, message->msg.payload, message->msg.payloadlen); if(rc){ - mosquitto__message_cleanup(&message); + message__cleanup(&message); return rc; } } @@ -128,7 +128,7 @@ int mosquitto__handle_publish(struct mosquitto *mosq) mosq->in_callback = false; } pthread_mutex_unlock(&mosq->callback_mutex); - mosquitto__message_cleanup(&message); + message__cleanup(&message); return MOSQ_ERR_SUCCESS; case 1: rc = mosquitto__send_puback(mosq, message->msg.mid); @@ -139,17 +139,17 @@ int mosquitto__handle_publish(struct mosquitto *mosq) mosq->in_callback = false; } pthread_mutex_unlock(&mosq->callback_mutex); - mosquitto__message_cleanup(&message); + message__cleanup(&message); return rc; case 2: rc = mosquitto__send_pubrec(mosq, message->msg.mid); pthread_mutex_lock(&mosq->in_message_mutex); message->state = mosq_ms_wait_for_pubrel; - mosquitto__message_queue(mosq, message, mosq_md_in); + message__queue(mosq, message, mosq_md_in); pthread_mutex_unlock(&mosq->in_message_mutex); return rc; default: - mosquitto__message_cleanup(&message); + message__cleanup(&message); return MOSQ_ERR_PROTOCOL; } } diff --git a/lib/read_handle_shared.c b/lib/read_handle_shared.c index 64e13541..459ac584 100644 --- a/lib/read_handle_shared.c +++ b/lib/read_handle_shared.c @@ -77,7 +77,7 @@ int mosquitto__handle_pubackcomp(struct mosquitto *mosq, const char *type) #else mosquitto__log_printf(mosq, MOSQ_LOG_DEBUG, "Client %s received %s (Mid: %d)", mosq->id, type, mid); - if(!mosquitto__message_delete(mosq, mid, mosq_md_out)){ + if(!message__delete(mosq, mid, mosq_md_out)){ /* Only inform the client the message has been sent once. */ pthread_mutex_lock(&mosq->callback_mutex); if(mosq->on_publish){ @@ -107,7 +107,7 @@ int mosquitto__handle_pubrec(struct mosquitto *mosq) #else mosquitto__log_printf(mosq, MOSQ_LOG_DEBUG, "Client %s received PUBREC (Mid: %d)", mosq->id, mid); - rc = mosquitto__message_out_update(mosq, mid, mosq_ms_wait_for_pubcomp); + rc = message__out_update(mosq, mid, mosq_ms_wait_for_pubcomp); #endif if(rc) return rc; rc = mosquitto__send_pubrel(mosq, mid); @@ -142,7 +142,7 @@ int mosquitto__handle_pubrel(struct mosquitto_db *db, struct mosquitto *mosq) #else mosquitto__log_printf(mosq, MOSQ_LOG_DEBUG, "Client %s received PUBREL (Mid: %d)", mosq->id, mid); - if(!mosquitto__message_remove(mosq, mid, mosq_md_in, &message)){ + if(!message__remove(mosq, mid, mosq_md_in, &message)){ /* Only pass the message on if we have removed it from the queue - this * prevents multiple callbacks for the same message. */ pthread_mutex_lock(&mosq->callback_mutex); @@ -152,7 +152,7 @@ int mosquitto__handle_pubrel(struct mosquitto_db *db, struct mosquitto *mosq) mosq->in_callback = false; } pthread_mutex_unlock(&mosq->callback_mutex); - mosquitto__message_cleanup(&message); + message__cleanup(&message); } #endif rc = mosquitto__send_pubcomp(mosq, mid);