upstream/mercurial-mirror Files · rust/chg/src/sendfds.c

errors: catch urllib errors specifically instead of using safehasattr()...

errors: catch urllib errors specifically instead of using safehasattr() Before this patch, we would catch `IOError` and `OSError` and check if the instance had a `.code` member (indicates `HTTPError`) or a `.reason` member (indicates the more generic `URLError`). It seems to me that can simply catch those exception specifically instead, so that's what this code does. The existing code is from (commands: report http exceptions nicely, 2005-06-17), so I suspect it's just that there was no `urllib2` (where `URLError` lives) back then. The old code mentioned `SSLError` in a comment. The new code does *not* try to catch that. The documentation for `ssl.SSLError` says that it has a `.reason` property, but `python -c 'import ssl; print(dir(ssl.SSLError("foo", Exception("bar"))))` doesn't mention that property on either Python 2 or Python 3 on my system. It also seems that `sslutil` is pretty careful about converting `ssl.SSLError` to `error.Abort`. It also is carefult to not assume that instances of the exception have a `.reason`. So I at least don't want to catch `ssl.SSLError` and handle it the same way as `URLError` because that would likely result in a crash. I also wonder if we don't need to handle it at all (because `sslutil` might handle all the cases). It's now early in the release cycle, so perhaps we can just see how it goes? Differential Revision: https://phab.mercurial-scm.org/D9318

Yuya Nishihara - - Load All Authors

File last commit:

r40005:208cb7a9 default


                r46442:ae00e170

default

Download file

             sendfds.c
        
                    51 lines
            
             | 1.3 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / rust / chg / src / sendfds.c
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       * Utility to send fds via Unix domain socket

       *

       * Copyright 2011, 2018 Yuya Nishihara <yuya@tcha.org>

       *

       * This software may be used and distributed according to the terms of the

       * GNU General Public License version 2 or any later version.

       */

      #include <errno.h>

      #include <stdlib.h>

      #include <string.h>

      #include <sys/socket.h>

      #include <sys/types.h>

      #define MAX_FD_LEN 10

      /*

       * Sends the given fds with 1-byte dummy payload.

       *

       * Returns the number of bytes sent on success, -1 on error and errno is set

       * appropriately.

       */

      ssize_t sendfds(int sockfd, const int *fds, size_t fdlen)

      {

      	char dummy[1] = {0};

      	struct iovec iov = {dummy, sizeof(dummy)};

      	char fdbuf[CMSG_SPACE(sizeof(fds[0]) * MAX_FD_LEN)];

      	struct msghdr msgh;

      	struct cmsghdr *cmsg;

      	/* just use a fixed-size buffer since we'll never send tons of fds */

      	if (fdlen > MAX_FD_LEN) {

      		errno = EINVAL;

      		return -1;

      	}

      	memset(&msgh, 0, sizeof(msgh));

      	msgh.msg_iov = &iov;

      	msgh.msg_iovlen = 1;

      	msgh.msg_control = fdbuf;

      	msgh.msg_controllen = CMSG_SPACE(sizeof(fds[0]) * fdlen);

      	cmsg = CMSG_FIRSTHDR(&msgh);

      	cmsg->cmsg_level = SOL_SOCKET;

      	cmsg->cmsg_type = SCM_RIGHTS;

      	cmsg->cmsg_len = CMSG_LEN(sizeof(fds[0]) * fdlen);

      	memcpy(CMSG_DATA(cmsg), fds, sizeof(fds[0]) * fdlen);

      	msgh.msg_controllen = cmsg->cmsg_len;

      	return sendmsg(sockfd, &msgh, 0);

      }

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				/*
				* Utility to send fds via Unix domain socket
				*
				* Copyright 2011, 2018 Yuya Nishihara <yuya@tcha.org>
				*
				* This software may be used and distributed according to the terms of the
				* GNU General Public License version 2 or any later version.
				*/

				#include <errno.h>
				#include <stdlib.h>
				#include <string.h>
				#include <sys/socket.h>
				#include <sys/types.h>

				#define MAX_FD_LEN 10

				/*
				* Sends the given fds with 1-byte dummy payload.
				*
				* Returns the number of bytes sent on success, -1 on error and errno is set
				* appropriately.
				*/
				ssize_t sendfds(int sockfd, const int *fds, size_t fdlen)
				{
				char dummy[1] = {0};
				struct iovec iov = {dummy, sizeof(dummy)};
				char fdbuf[CMSG_SPACE(sizeof(fds[0]) * MAX_FD_LEN)];
				struct msghdr msgh;
				struct cmsghdr *cmsg;

				/* just use a fixed-size buffer since we'll never send tons of fds */
				if (fdlen > MAX_FD_LEN) {
				errno = EINVAL;
				return -1;
				}

				memset(&msgh, 0, sizeof(msgh));
				msgh.msg_iov = &iov;
				msgh.msg_iovlen = 1;
				msgh.msg_control = fdbuf;
				msgh.msg_controllen = CMSG_SPACE(sizeof(fds[0]) * fdlen);

				cmsg = CMSG_FIRSTHDR(&msgh);
				cmsg->cmsg_level = SOL_SOCKET;
				cmsg->cmsg_type = SCM_RIGHTS;
				cmsg->cmsg_len = CMSG_LEN(sizeof(fds[0]) * fdlen);
				memcpy(CMSG_DATA(cmsg), fds, sizeof(fds[0]) * fdlen);
				msgh.msg_controllen = cmsg->cmsg_len;
				return sendmsg(sockfd, &msgh, 0);
				}