d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix poll() build

Browse Source
This commit is contained in:
Roger A. Light 2020-11-17 10:51:50 +00:00
parent 7172867ff0
commit 5db9884bac
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/mux_poll.c
View File

@ -55,7 +55,7 @@ Contributors:
#include "util_mosq.h"
#include "mux.h"
static void loop_handle_reads_writes(struct mosquitto_db *db, struct pollfd *pollfds);
static void loop_handle_reads_writes(struct pollfd *pollfds);
static struct pollfd *pollfds = NULL;
static size_t pollfd_max;
@ -63,7 +63,7 @@ static size_t pollfd_max;
static sigset_t my_sigblock;
#endif
int mux_poll__init(struct mosquitto_db *db, struct mosquitto__listener_sock *listensock, int listensock_count)
int mux_poll__init(struct mosquitto__listener_sock *listensock, int listensock_count)
{
int i;
int pollfd_index = 0;
@ -101,7 +101,7 @@ int mux_poll__init(struct mosquitto_db *db, struct mosquitto__listener_sock *lis
}
int mux_poll__add_out(struct mosquitto_db *db, struct mosquitto *context)
int mux_poll__add_out(struct mosquitto *context)
{
int i;
@ -125,13 +125,13 @@ int mux_poll__add_out(struct mosquitto_db *db, struct mosquitto *context)
}
int mux_poll__remove_out(struct mosquitto_db *db, struct mosquitto *context)
int mux_poll__remove_out(struct mosquitto *context)
{
return mux_poll__add_in(db, context);
return mux_poll__add_in(context);
}
int mux_poll__add_in(struct mosquitto_db *db, struct mosquitto *context)
int mux_poll__add_in(struct mosquitto *context)
{
int i;
@ -154,7 +154,7 @@ int mux_poll__add_in(struct mosquitto_db *db, struct mosquitto *context)
return MOSQ_ERR_SUCCESS;
}
int mux_poll__delete(struct mosquitto_db *db, struct mosquitto *context)
int mux_poll__delete(struct mosquitto *context)
{
if(context->pollfd_index != -1){
pollfds[context->pollfd_index].fd = -1;
@ -169,7 +169,7 @@ int mux_poll__delete(struct mosquitto_db *db, struct mosquitto *context)
int mux_poll__handle(struct mosquitto_db *db, struct mosquitto__listener_sock *listensock, int listensock_count)
int mux_poll__handle(struct mosquitto__listener_sock *listensock, int listensock_count)
{
struct mosquitto *context;
mosq_sock_t sock;
@ -187,8 +187,8 @@ int mux_poll__handle(struct mosquitto_db *db, struct mosquitto__listener_sock *l
fdcount = WSAPoll(pollfds, pollfd_max, 100);
#endif
db->now_s = mosquitto_time();
db->now_real_s = time(NULL);
db.now_s = mosquitto_time();
db.now_real_s = time(NULL);
if(fdcount == -1){
# ifdef WIN32
@ -204,18 +204,18 @@ int mux_poll__handle(struct mosquitto_db *db, struct mosquitto__listener_sock *l
log__printf(NULL, MOSQ_LOG_ERR, "Error in poll: %s.", strerror(errno));
}
}else{
loop_handle_reads_writes(db, pollfds);
loop_handle_reads_writes(pollfds);
for(i=0; i<listensock_count; i++){
if(pollfds[i].revents & (POLLIN | POLLPRI)){
while((sock = net__socket_accept(db, &listensock[i])) != -1){
while((sock = net__socket_accept(&listensock[i])) != -1){
context = NULL;
HASH_FIND(hh_sock, db->contexts_by_sock, &sock, sizeof(mosq_sock_t), context);
HASH_FIND(hh_sock, db.contexts_by_sock, &sock, sizeof(mosq_sock_t), context);
if(!context) {
log__printf(NULL, MOSQ_LOG_ERR, "Error in poll accepting: no context");
}
context->pollfd_index = -1;
mux__add_in(db, context);
mux__add_in(context);
}
}
}
@ -224,7 +224,7 @@ int mux_poll__handle(struct mosquitto_db *db, struct mosquitto__listener_sock *l
}
int mux_poll__cleanup(struct mosquitto_db *db)
int mux_poll__cleanup(void)
{
mosquitto__free(pollfds);
pollfds = NULL;
@ -233,14 +233,14 @@ int mux_poll__cleanup(struct mosquitto_db *db)
}
static void loop_handle_reads_writes(struct mosquitto_db *db, struct pollfd *pollfds)
static void loop_handle_reads_writes(struct pollfd *pollfds)
{
struct mosquitto *context, *ctxt_tmp;
int err;
socklen_t len;
int rc;
HASH_ITER(hh_sock, db->contexts_by_sock, context, ctxt_tmp){
HASH_ITER(hh_sock, db.contexts_by_sock, context, ctxt_tmp){
if(context->pollfd_index < 0){
continue;
}
@ -276,25 +276,25 @@ static void loop_handle_reads_writes(struct mosquitto_db *db, struct pollfd *pol
mosquitto__set_state(context, mosq_cs_new);
#if defined(WITH_ADNS) && defined(WITH_BRIDGE)
if(context->bridge){
bridge__connect_step3(db, context);
bridge__connect_step3(context);
continue;
}
#endif
}
}else{
do_disconnect(db, context, MOSQ_ERR_CONN_LOST);
do_disconnect(context, MOSQ_ERR_CONN_LOST);
continue;
}
}
rc = packet__write(context);
if(rc){
do_disconnect(db, context, rc);
do_disconnect(context, rc);
continue;
}
}
}
HASH_ITER(hh_sock, db->contexts_by_sock, context, ctxt_tmp){
HASH_ITER(hh_sock, db.contexts_by_sock, context, ctxt_tmp){
if(context->pollfd_index < 0){
continue;
}
@ -312,15 +312,15 @@ static void loop_handle_reads_writes(struct mosquitto_db *db, struct pollfd *pol
if(pollfds[context->pollfd_index].revents & POLLIN){
#endif
do{
rc = packet__read(db, context);
rc = packet__read(context);
if(rc){
do_disconnect(db, context, rc);
do_disconnect(context, rc);
continue;
}
}while(SSL_DATA_PENDING(context));
}else{
if(context->pollfd_index >= 0 && pollfds[context->pollfd_index].revents & (POLLERR | POLLNVAL | POLLHUP)){
do_disconnect(db, context, MOSQ_ERR_CONN_LOST);
do_disconnect(context, MOSQ_ERR_CONN_LOST);
continue;
}
}