Differences From Artifact [d737be39ca]:
- File
src/exceptions/OFAddressTranslationFailedException.m
— part of check-in
[3d16a30f41]
at
2013-06-22 12:12:36
on branch trunk
— Rework exceptions.
This mostly removes the argument for the class in which the exception
occurred. As backtraces were recently added for all platforms, the
passed class does not give any extra information on where the exception
occurred anymore.This also removes a few other arguments which were not too helpful. In
the past, the idea was to pass as many arguments as possible so that it
is easier to find the origin of the exception. However, as backtraces
are a much better way to find the origin, those are not useful anymore
and just make the exception more cumbersome to use. The rule is now to
only pass arguments that might help in recovering from the exception or
provide information that is otherwise not easily accessible. (user: js, size: 2441) [annotate] [blame] [check-ins using]
To Artifact [075dc3d4fd]:
- File
src/exceptions/OFAddressTranslationFailedException.m
— part of check-in
[3f74e4c5df]
at
2013-06-23 14:15:57
on branch trunk
— Improve OFAddressTranslationFailedException.
This adds +[exceptionWithHost:]. This is useful when a hostname is
resolved without a socket. (user: js, size: 2928) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 |
#import "common.h"
@implementation OFAddressTranslationFailedException
+ (instancetype)exceptionWithSocket: (OFTCPSocket*)socket
{
return [[[self alloc] initWithSocket: socket] autorelease];
}
+ (instancetype)exceptionWithHost: (OFString*)host
socket: (OFTCPSocket*)socket
{
return [[[self alloc] initWithHost: host
socket: socket] autorelease];
}
| > > > > > | < < < | < < | < | < | < < < < < < < | < | 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 |
#import "common.h"
@implementation OFAddressTranslationFailedException
+ (instancetype)exceptionWithSocket: (OFTCPSocket*)socket
{
return [[[self alloc] initWithSocket: socket] autorelease];
}
+ (instancetype)exceptionWithHost: (OFString*)host
{
return [[[self alloc] initWithHost: host] autorelease];
}
+ (instancetype)exceptionWithHost: (OFString*)host
socket: (OFTCPSocket*)socket
{
return [[[self alloc] initWithHost: host
socket: socket] autorelease];
}
- initWithSocket: (OFTCPSocket*)socket
{
return [self initWithHost: nil
socket: socket];
}
- initWithHost: (OFString*)host
{
return [self initWithHost: host
socket: nil];
}
- initWithHost: (OFString*)host
socket: (OFTCPSocket*)socket
{
self = [super init];
|
| ︙ | ︙ | |||
85 86 87 88 89 90 91 |
[_socket release];
[super dealloc];
}
- (OFString*)description
{
| | | | | > > > > > > > > > > > | 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 |
[_socket release];
[super dealloc];
}
- (OFString*)description
{
if (_host != nil && _socket != nil)
return [OFString stringWithFormat:
@"The host %@ could not be translated to an address for a "
@"socket of type %@. This means that either the host was "
@"not found, there was a problem with the name server, "
@"there was a problem with your network connection or you "
@"specified an invalid host. " ERRFMT, _host,
[_socket class], AT_ERRPARAM];
else if (_socket != nil)
return [OFString stringWithFormat:
@"An address could not be translated for a socket of type "
@"%@! " ERRFMT, [_socket class],
AT_ERRPARAM];
else if (_host != nil)
return [OFString stringWithFormat:
@"The host %@ could not be translated to an address. This "
@"means that either the host was not found, there was a "
@"problem with the name server, there was a problem with "
@"your network connection or you specified an invalid "
@"host. " ERRFMT, _host, AT_ERRPARAM];
else
return [OFString stringWithFormat:
@"An address could not be translated! " ERRFMT,
AT_ERRPARAM];
}
- (OFString*)host
{
OF_GETTER(_host, false)
}
|
| ︙ | ︙ |