summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f47a2b1)
We might return a failure here, if the underlying syscall fails, and
should propagate the `errno' it returned.
Also hoist out some block-scope variables now that their enclosing block
has vanished.
int getsockname(int sk, struct sockaddr *sa, socklen_t *len)
{
int getsockname(int sk, struct sockaddr *sa, socklen_t *len)
{
+ char sabuf[1024];
+ socklen_t mylen = sizeof(sabuf);
int rc;
Dpid;
D( fprintf(stderr, "noip(%d): GETSOCKNAME sk=%d", pid, sk); )
int rc;
Dpid;
D( fprintf(stderr, "noip(%d): GETSOCKNAME sk=%d", pid, sk); )
- PRESERVING_ERRNO({
- char sabuf[1024];
- socklen_t mylen = sizeof(sabuf);
- rc = real_getsockname(sk, SA(sabuf), &mylen);
- if (rc >= 0) {
- D( fprintf(stderr, " -> converting...\n"); )
- return_fake_name(SA(sabuf), mylen, sa, len);
- D( fprintf(stderr, "noip(%d): ... GETSOCKNAME", pid); )
- }
- });
+ rc = real_getsockname(sk, SA(sabuf), &mylen);
+ if (rc >= 0) {
+ D( fprintf(stderr, " -> converting...\n"); )
+ return_fake_name(SA(sabuf), mylen, sa, len);
+ D( fprintf(stderr, "noip(%d): ... GETSOCKNAME", pid); )
+ }
D( dump_addrresult(rc, sa, *len); )
return (rc);
}
int getpeername(int sk, struct sockaddr *sa, socklen_t *len)
{
D( dump_addrresult(rc, sa, *len); )
return (rc);
}
int getpeername(int sk, struct sockaddr *sa, socklen_t *len)
{
+ char sabuf[1024];
+ socklen_t mylen = sizeof(sabuf);
int rc;
Dpid;
D( fprintf(stderr, "noip(%d): GETPEERNAME sk=%d", pid, sk); )
int rc;
Dpid;
D( fprintf(stderr, "noip(%d): GETPEERNAME sk=%d", pid, sk); )
- PRESERVING_ERRNO({
- char sabuf[1024];
- socklen_t mylen = sizeof(sabuf);
- rc = real_getpeername(sk, SA(sabuf), &mylen);
- if (rc >= 0) {
- D( fprintf(stderr, " -> converting...\n"); )
- return_fake_name(SA(sabuf), mylen, sa, len);
- D( fprintf(stderr, "noip(%d): ... GETPEERNAME", pid); )
- }
- });
+ rc = real_getpeername(sk, SA(sabuf), &mylen);
+ if (rc >= 0) {
+ D( fprintf(stderr, " -> converting...\n"); )
+ return_fake_name(SA(sabuf), mylen, sa, len);
+ D( fprintf(stderr, "noip(%d): ... GETPEERNAME", pid); )
+ }
D( dump_addrresult(rc, sa, *len); )
return (0);
}
D( dump_addrresult(rc, sa, *len); )
return (0);
}