Differences From Artifact [03825848e7]:
- File src/exceptions/OFConnectionFailedException.m — part of check-in [cfd374b906] at 2015-01-03 20:57:18 on branch trunk — Update copyright (user: js, size: 1778) [annotate] [blame] [check-ins using]
To Artifact [77019ce3e4]:
- File
src/exceptions/OFConnectionFailedException.m
— part of check-in
[62e2de30b9]
at
2015-02-16 08:39:17
on branch trunk
— Explicitly pass errno to exceptions
The old behaviour where the exception would access errno directly on
creation of the exception was very fragile. The two main problems with
it were that sometimes it would pick up an errno even though none had
been set and in other cases that when the exception was created errno
had already been overridden.This also greatly increases errno handling on Win32, especially in
conjunction with sockets. It can still be improved further, though. (user: js, size: 2423) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFConnectionFailedException.h" #import "OFString.h" | < < > > > > > > > > > > > | | > > > > > > > > > > > > > > > > > > > | > | | | > > > > > | < < < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 | */ #include "config.h" #import "OFConnectionFailedException.h" #import "OFString.h" @implementation OFConnectionFailedException + (instancetype)exceptionWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket { return [[[self alloc] initWithHost: host port: port socket: socket] autorelease]; } + (instancetype)exceptionWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo { return [[[self alloc] initWithHost: host port: port socket: socket errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket { self = [super init]; @try { _host = [host copy]; _socket = [socket retain]; _port = port; } @catch (id e) { [self release]; @throw e; } return self; } - initWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo { self = [super init]; @try { _host = [host copy]; _socket = [socket retain]; _port = port; _errNo = errNo; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_host release]; [_socket release]; [super dealloc]; } - (OFString*)description { if (_errNo != 0) return [OFString stringWithFormat: @"A connection to %@ on port %" @PRIu16 @" could not be " @"established in socket of type %@: %@", _host, _port, [_socket class], of_strerror(_errNo)]; else return [OFString stringWithFormat: @"A connection to %@ on port %" @PRIu16 @" could not be " @"established in socket of type %@!", _host, _port, [_socket class]]; } - (OFString*)host { OF_GETTER(_host, true) } - (uint16_t)port { return _port; } - (id)socket { OF_GETTER(_socket, true) } - (int)errNo { return _errNo; } @end |