diff options
Diffstat (limited to 'avahi-daemon')
-rw-r--r-- | avahi-daemon/dbus-protocol.c | 34 | ||||
-rw-r--r-- | avahi-daemon/main.c | 10 |
2 files changed, 22 insertions, 22 deletions
diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c index b6a4e5d..0b1a6e8 100644 --- a/avahi-daemon/dbus-protocol.c +++ b/avahi-daemon/dbus-protocol.c @@ -68,9 +68,9 @@ typedef struct ServiceBrowserInfo ServiceBrowserInfo; typedef struct SyncServiceResolverInfo SyncServiceResolverInfo; typedef struct AsyncServiceResolverInfo AsyncServiceResolverInfo; -#define MAX_CLIENTS 256 -#define MAX_OBJECTS_PER_CLIENT 50 -#define MAX_ENTRIES_PER_ENTRY_GROUP 20 +#define CLIENTS_MAX 256 +#define OBJECTS_PER_CLIENT_MAX 50 +#define ENTRIES_PER_ENTRY_GROUP_MAX 20 /* #define VALGRIND_WORKAROUND 1 */ @@ -394,7 +394,7 @@ static Client *client_get(const char *name, int create) { if (!create) return NULL; - if (server->n_clients >= MAX_CLIENTS) + if (server->n_clients >= CLIENTS_MAX) return NULL; /* If not existant yet, create a new entry */ @@ -863,7 +863,7 @@ static DBusHandlerResult msg_entry_group_impl(DBusConnection *c, DBusMessage *m, goto fail; } - if (!(flags & AVAHI_PUBLISH_UPDATE) && i->n_entries >= MAX_ENTRIES_PER_ENTRY_GROUP) { + if (!(flags & AVAHI_PUBLISH_UPDATE) && i->n_entries >= ENTRIES_PER_ENTRY_GROUP_MAX) { avahi_string_list_free(strlst); return respond_error(c, m, AVAHI_ERR_TOO_MANY_ENTRIES, NULL); } @@ -906,7 +906,7 @@ static DBusHandlerResult msg_entry_group_impl(DBusConnection *c, DBusMessage *m, goto fail; } - if (!(flags & AVAHI_PUBLISH_UPDATE) && i->n_entries >= MAX_ENTRIES_PER_ENTRY_GROUP) + if (!(flags & AVAHI_PUBLISH_UPDATE) && i->n_entries >= ENTRIES_PER_ENTRY_GROUP_MAX) return respond_error(c, m, AVAHI_ERR_TOO_MANY_ENTRIES, NULL); if (domain && !*domain) @@ -971,7 +971,7 @@ static DBusHandlerResult msg_entry_group_impl(DBusConnection *c, DBusMessage *m, goto fail; } - if (!(flags & AVAHI_PUBLISH_UPDATE) && i->n_entries >= MAX_ENTRIES_PER_ENTRY_GROUP) + if (!(flags & AVAHI_PUBLISH_UPDATE) && i->n_entries >= ENTRIES_PER_ENTRY_GROUP_MAX) return respond_error(c, m, AVAHI_ERR_TOO_MANY_ENTRIES, NULL); if (!(avahi_address_parse(address, AVAHI_PROTO_UNSPEC, &a))) @@ -1918,7 +1918,7 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void return respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); } - if (client->n_objects >= MAX_OBJECTS_PER_CLIENT) { + if (client->n_objects >= OBJECTS_PER_CLIENT_MAX) { avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); return respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); } @@ -1963,7 +1963,7 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void return respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); } - if (client->n_objects >= MAX_OBJECTS_PER_CLIENT) { + if (client->n_objects >= OBJECTS_PER_CLIENT_MAX) { avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); return respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); } @@ -2008,7 +2008,7 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void return respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); } - if (client->n_objects >= MAX_OBJECTS_PER_CLIENT) { + if (client->n_objects >= OBJECTS_PER_CLIENT_MAX) { avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); return respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); } @@ -2058,7 +2058,7 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void return respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); } - if (client->n_objects >= MAX_OBJECTS_PER_CLIENT) { + if (client->n_objects >= OBJECTS_PER_CLIENT_MAX) { avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); return respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); } @@ -2113,7 +2113,7 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void } - if (client->n_objects >= MAX_OBJECTS_PER_CLIENT) { + if (client->n_objects >= OBJECTS_PER_CLIENT_MAX) { avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); return respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); } @@ -2169,7 +2169,7 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void } - if (client->n_objects >= MAX_OBJECTS_PER_CLIENT) { + if (client->n_objects >= OBJECTS_PER_CLIENT_MAX) { avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); return respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); } @@ -2218,7 +2218,7 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void return respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); } - if (client->n_objects >= MAX_OBJECTS_PER_CLIENT) { + if (client->n_objects >= OBJECTS_PER_CLIENT_MAX) { avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); return respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); } @@ -2276,7 +2276,7 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void return respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); } - if (client->n_objects >= MAX_OBJECTS_PER_CLIENT) { + if (client->n_objects >= OBJECTS_PER_CLIENT_MAX) { avahi_log_warn(__FILE__": Too many objects for client '%s', client request failed.", client->name); return respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); } @@ -2336,7 +2336,7 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void return respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); } - if (client->n_objects >= MAX_OBJECTS_PER_CLIENT) { + if (client->n_objects >= OBJECTS_PER_CLIENT_MAX) { avahi_log_warn(__FILE__": Too many objects for client '%s', client request failed.", client->name); return respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); } @@ -2391,7 +2391,7 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void return respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); } - if (client->n_objects >= MAX_OBJECTS_PER_CLIENT) { + if (client->n_objects >= OBJECTS_PER_CLIENT_MAX) { avahi_log_warn(__FILE__": Too many objects for client '%s', client request failed.", client->name); return respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); } diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index 0e7bbf4..cf87e23 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -130,9 +130,9 @@ static int load_resolv_conf(const DaemonConfig *c) { goto finish; } - resolv_conf = avahi_new0(char*, AVAHI_MAX_WIDE_AREA_SERVERS+1); + resolv_conf = avahi_new0(char*, AVAHI_WIDE_AREA_SERVERS_MAX+1); - while (!feof(f) && i < AVAHI_MAX_WIDE_AREA_SERVERS) { + while (!feof(f) && i < AVAHI_WIDE_AREA_SERVERS_MAX) { char ln[128]; char *p; @@ -204,11 +204,11 @@ static void remove_dns_server_entry_groups(void) { } static void update_wide_area_servers(void) { - AvahiAddress a[AVAHI_MAX_WIDE_AREA_SERVERS]; + AvahiAddress a[AVAHI_WIDE_AREA_SERVERS_MAX]; unsigned n = 0; char **p; - for (p = resolv_conf; *p && n < AVAHI_MAX_WIDE_AREA_SERVERS; p++) { + for (p = resolv_conf; *p && n < AVAHI_WIDE_AREA_SERVERS_MAX; p++) { if (!avahi_address_parse(*p, AVAHI_PROTO_UNSPEC, &a[n])) avahi_log_warn("Failed to parse address '%s', ignoring.", *p); else @@ -987,7 +987,7 @@ int main(int argc, char *argv[]) { /** Parent **/ if ((ret = daemon_retval_wait(20)) < 0) { - avahi_log_error("Could not recieve return value from daemon process."); + avahi_log_error("Could not receive return value from daemon process."); goto finish; } |