mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

added support for ipv6. 

Fixes a possible memory overflow.
pixma-add-canon-ts-3400-series
Thierry HUCHARD 2020-12-29 12:37:38 +01:00 zatwierdzone przez Ordissimo
rodzic db6e4fd77f
commit 4752a9c379
1 zmienionych plików z 15 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
backend/escl/escl_devices.c
Wyświetl plik

@ -53,16 +53,20 @@ static int count_finish = 0;
*/ */
static void static void
resolve_callback(AvahiServiceResolver *r, AVAHI_GCC_UNUSED AvahiIfIndex interface, resolve_callback(AvahiServiceResolver *r, AVAHI_GCC_UNUSED AvahiIfIndex interface,
AVAHI_GCC_UNUSED AvahiProtocol protocol, AvahiProtocol protocol,
AvahiResolverEvent event, const char *name, AvahiResolverEvent event,
const char *name,
const char __sane_unused__ *type, const char __sane_unused__ *type,
const char __sane_unused__ *domain, const char __sane_unused__ *domain,
const char __sane_unused__ *host_name, const char __sane_unused__ *host_name,
const AvahiAddress *address, uint16_t port, AvahiStringList *txt, const AvahiAddress *address,
uint16_t port,
AvahiStringList *txt,
AvahiLookupResultFlags __sane_unused__ flags, AvahiLookupResultFlags __sane_unused__ flags,
void __sane_unused__ *userdata) void __sane_unused__ *userdata)
{ {
char a[AVAHI_ADDRESS_STR_MAX], *t; char a[(AVAHI_ADDRESS_STR_MAX + 2)] = { 0 };
char *t;
const char *is; const char *is;
const char *uuid; const char *uuid;
AvahiStringList *s; AvahiStringList *s;
@ -71,7 +75,13 @@ resolve_callback(AvahiServiceResolver *r, AVAHI_GCC_UNUSED AvahiIfIndex interfac
case AVAHI_RESOLVER_FAILURE: case AVAHI_RESOLVER_FAILURE:
break; break;
case AVAHI_RESOLVER_FOUND: case AVAHI_RESOLVER_FOUND:
avahi_address_snprint(a, sizeof(a), address); if (protocol == AVAHI_PROTO_INET6) {
char b[AVAHI_ADDRESS_STR_MAX] = { 0 };
avahi_address_snprint(b, sizeof(b), address);
snprintf(a, sizeof(a), "[%s]", b);
}
else
avahi_address_snprint(a, sizeof(a), address);
t = avahi_string_list_to_string(txt); t = avahi_string_list_to_string(txt);
if (strstr(t, "\"rs=eSCL\"") || strstr(t, "\"rs=/eSCL\"")) { if (strstr(t, "\"rs=eSCL\"") || strstr(t, "\"rs=/eSCL\"")) {
char ip_add[PATH_MAX] = {0}; char ip_add[PATH_MAX] = {0};