s/tics/seconds/g

README.md

@@ -121,7 +121,7 @@ The following `auth_opt_` options are supported by the mysql back-end:
 | mysql_opt_reconnect | true | | enable MYSQL_OPT_RECONNECT option
 | mysql_auto_connect | true | | enable auto_connect function
 | anonusername | | | username to use for anonymous connections
-| cachetics | 300 | | number of seconds to cache ACL lookups
+| cacheseconds | 300 | | number of seconds to cache ACL lookups
 
 The SQL query for looking up a user's password hash is mandatory. The query
 MUST return a single row only (any other number of rows is considered to be

auth-plug.c

@@ -116,7 +116,7 @@ int mosquitto_auth_plugin_init(void **userdata, struct mosquitto_auth_opt *auth_
  ud->authentication_be = -1;
  ud->fallback_be = -1;
  ud->anonusername = NULL;
- ud->cachetics = 300;
+ ud->cacheseconds = 300;
  ud->aclcache = NULL;
 
  /*
@@ -134,8 +134,8 @@ int mosquitto_auth_plugin_init(void **userdata, struct mosquitto_auth_opt *auth_
  ud->superusers = strdup(o->value);
  if (!strcmp(o->key, "anonusername"))
  ud->anonusername = strdup(o->value);
- if (!strcmp(o->key, "cachetics"))
- ud->cachetics = atol(o->value);
+ if (!strcmp(o->key, "cacheseconds"))
+ ud->cacheseconds = atol(o->value);
 #if 0
  if (!strcmp(o->key, "topic_prefix"))
  ud->topicprefix = strdup(o->value);

cache.c

@@ -88,23 +88,23 @@ void acl_cache(const char *clientid, const char *username, const char *topic, in
  char hex[SHA_DIGEST_LENGTH * 2 + 1];
  struct aclcache *a;
  struct userdata *ud = (struct userdata *)userdata;
- time_t cachetics = ud->cachetics;
+ time_t cacheseconds = ud->cacheseconds;
 
  hexify(clientid, username, topic, access, hex);
 
  HASH_FIND_STR(ud->aclcache, hex, a);
  if (a) {
  granted = a->granted;
 
- if (time(NULL) > (a->tics + cachetics)) {
+ if (time(NULL) > (a->seconds + cacheseconds)) {
  printf("EXPIRED!!!!!!!!!!!!!\n");
  HASH_DEL(ud->aclcache, a);
  }
  } else {
  a = (struct aclcache *)malloc(sizeof(struct aclcache));
  strcpy(a->hex, hex);
  a->granted = granted;
- a->tics = time(NULL);
+ a->seconds = time(NULL);
  HASH_ADD_STR(ud->aclcache, hex, a);
  }
 }
@@ -114,7 +114,7 @@ int cache_q(const char *clientid, const char *username, const char *topic, int a
  char hex[SHA_DIGEST_LENGTH * 2 + 1];
  struct aclcache *a;
  struct userdata *ud = (struct userdata *)userdata;
- time_t cachetics = ud->cachetics;
+ time_t cacheseconds = ud->cacheseconds;
  int granted = MOSQ_ERR_UNKNOWN;
 
  hexify(clientid, username, topic, access, hex);
@@ -125,7 +125,7 @@ int cache_q(const char *clientid, const char *username, const char *topic, int a
 
  granted = a->granted;
 
- if (time(NULL) > (a->tics + cachetics)) {
+ if (time(NULL) > (a->seconds + cacheseconds)) {
  printf("EXPIRED!!!!!!!!!!!!!\n");
  HASH_DEL(ud->aclcache, a);
  }

cache.h

@@ -37,7 +37,7 @@
 struct aclcache {
  char hex[SHA_DIGEST_LENGTH * 2 + 1]; /* key within struct */
  int granted;
- time_t tics;
+ time_t seconds;
  UT_hash_handle hh;
 };
 

userdata.h

@@ -40,7 +40,7 @@ struct userdata {
  int authentication_be; /* Back-end number user was authenticated in */
  int fallback_be; /* Backend to use for anonymous connections */
  char *anonusername; /* Configured name of anonymous MQTT user */
- time_t cachetics; /* number of seconds to cache ACL lookups */
+ time_t cacheseconds; /* number of seconds to cache ACL lookups */
  struct aclcache *aclcache;
 };