X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fstream-tcp.c;h=0384c42f9de8bb003832321702289405729563a5;hb=a6ca7c672f6d5aaf24111d3414ea132ec36b40d6;hp=97492937bbb163093728255263f09ecdcae54e39;hpb=e368cad8ecf6dbf272b2a3775b2e3e5e2dc6a5cf;p=sliver-openvswitch.git diff --git a/lib/stream-tcp.c b/lib/stream-tcp.c index 97492937b..0384c42f9 100644 --- a/lib/stream-tcp.c +++ b/lib/stream-tcp.c @@ -116,8 +116,9 @@ ptcp_open(const char *name OVS_UNUSED, char *suffix, struct pstream **pstreamp, } sprintf(bound_name, "ptcp:%"PRIu16":"IP_FMT, - ntohs(sin.sin_port), IP_ARGS(&sin.sin_addr.s_addr)); - return new_fd_pstream(bound_name, fd, ptcp_accept, NULL, pstreamp); + ntohs(sin.sin_port), IP_ARGS(sin.sin_addr.s_addr)); + return new_fd_pstream(bound_name, fd, ptcp_accept, set_dscp, NULL, + pstreamp); } static int @@ -128,7 +129,7 @@ ptcp_accept(int fd, const struct sockaddr *sa, size_t sa_len, char name[128]; if (sa_len == sizeof(struct sockaddr_in) && sin->sin_family == AF_INET) { - sprintf(name, "tcp:"IP_FMT, IP_ARGS(&sin->sin_addr)); + sprintf(name, "tcp:"IP_FMT, IP_ARGS(sin->sin_addr.s_addr)); sprintf(strchr(name, '\0'), ":%"PRIu16, ntohs(sin->sin_port)); } else { strcpy(name, "tcp"); @@ -142,6 +143,7 @@ const struct pstream_class ptcp_pstream_class = { ptcp_open, NULL, NULL, - NULL + NULL, + NULL, };