- const struct sockaddr_in *inaddr = &dsi->server;
-
- if (inaddr->sin_port == htons(DSI_AFPOVERTCP_PORT)) {
- *data++ = 6; /* length */
- *data++ = 0x01; /* basic ip address */
- memcpy(data, &inaddr->sin_addr.s_addr,
- sizeof(inaddr->sin_addr.s_addr));
- data += sizeof(inaddr->sin_addr.s_addr);
- addresses_len += 7;
- } else {
- /* ip address + port */
- *data++ = 8;
- *data++ = 0x02; /* ip address with port */
- memcpy(data, &inaddr->sin_addr.s_addr,
- sizeof(inaddr->sin_addr.s_addr));
- data += sizeof(inaddr->sin_addr.s_addr);
- memcpy(data, &inaddr->sin_port, sizeof(inaddr->sin_port));
- data += sizeof(inaddr->sin_port);
- addresses_len += 9;
+ if (dsi->server.ss_family == AF_INET) { /* IPv4 */
+ const struct sockaddr_in *inaddr = (struct sockaddr_in *)&dsi->server;
+ if (inaddr->sin_port == htons(DSI_AFPOVERTCP_PORT)) {
+ *data++ = 6; /* length */
+ *data++ = 0x01; /* basic ip address */
+ memcpy(data, &inaddr->sin_addr.s_addr,
+ sizeof(inaddr->sin_addr.s_addr));
+ data += sizeof(inaddr->sin_addr.s_addr);
+ addresses_len += 7;
+ } else {
+ /* ip address + port */
+ *data++ = 8;
+ *data++ = 0x02; /* ip address with port */
+ memcpy(data, &inaddr->sin_addr.s_addr,
+ sizeof(inaddr->sin_addr.s_addr));
+ data += sizeof(inaddr->sin_addr.s_addr);
+ memcpy(data, &inaddr->sin_port, sizeof(inaddr->sin_port));
+ data += sizeof(inaddr->sin_port);
+ addresses_len += 9;
+ }
+ } else { /* IPv6 */
+ const struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)&dsi->server;
+ if (sa6->sin6_port == htons(DSI_AFPOVERTCP_PORT)) {
+ *data++ = 18; /* length */
+ *data++ = 6; /* type */
+ memcpy(data, &sa6->sin6_addr.s6_addr, sizeof(sa6->sin6_addr.s6_addr));
+ data += sizeof(sa6->sin6_addr.s6_addr);
+ addresses_len += 19;
+ } else {
+ /* ip address + port */
+ *data++ = 20; /* length */
+ *data++ = 7; /* type*/
+ memcpy(data, &sa6->sin6_addr.s6_addr, sizeof(sa6->sin6_addr.s6_addr));
+ data += sizeof(sa6->sin6_addr.s6_addr);
+ memcpy(data, &sa6->sin6_port, sizeof(sa6->sin6_port));
+ data += sizeof(sa6->sin6_port);
+ addresses_len += 21;
+ }
+