[v1_0_0b] reorder .mes files

src/bin/dhcp4/dhcp4_messages.mes

@@ -194,18 +194,18 @@ address that it is not supposed to. The server will fully recover from this
 situation, but if the underlying problem of a misconfigured or rogue device
 is not solved, this address may be declined again in the future.
 
-% DHCP4_DECLINE_LEASE_NOT_FOUND Received DHCPDECLINE for addr %1 from client %2, but no such lease found.
-This warning message indicates that a client reported that his address was
-detected as a duplicate (i.e. another device in the network is using this address).
-However, the server does not have a record for this address. This may indicate
-a client's error or a server's purged database.
-
 % DHCP4_DECLINE_LEASE_MISMATCH Received DHCPDECLINE for addr %1 from client %2, but the data doesn't match: received hwaddr: %3, lease hwaddr: %4, received client-id: %5, lease client-id: %6
 This informational message means that a client attempted to report his address
 as declined (i.e. used by unknown entity). The server has information about
 a lease for that address, but the client's hardware address or client identifier
 does not match the server's stored information. The client's request will be ignored.
 
+% DHCP4_DECLINE_LEASE_NOT_FOUND Received DHCPDECLINE for addr %1 from client %2, but no such lease found.
+This warning message indicates that a client reported that his address was
+detected as a duplicate (i.e. another device in the network is using this address).
+However, the server does not have a record for this address. This may indicate
+a client's error or a server's purged database.
+
 % DHCP4_DISCOVER_CLASS_PROCESSING_FAILED %1: client class specific processing failed for DHCPDISCOVER
 This debug message means that the server processing that is unique for each
 client class has reported a failure. The response packet will not be sent.
@@ -529,7 +529,6 @@ A debug message printing the details of the received packet. The first
 argument includes the client and the transaction identification
 information.
 
-
 % DHCP4_RELEASE %1: address %2 was released properly.
 This debug message indicates that an address was released properly. It
 is a normal operation during client shutdown. The first argument includes

src/bin/dhcp6/dhcp6_messages.mes

@@ -196,12 +196,6 @@ This message is printed when DHCPv6 server disables an interface from being
 used to receive DHCPv6 traffic. Sockets on this interface will not be opened
 by the Interface Manager until interface is enabled.
 
-% DHCP6_DECLINE_PROCESS_IA Processing of IA (IAID: %1) from client %2 started.
-This debug message is printed when the server starts processing an IA_NA option
-received in Decline message. It's expected that the option will contain an
-address that is being declined. Specific information will be printed in a
-separate message.
-
 % DHCP6_DECLINE_FAIL_DUID_MISMATCH Client %1 sent DECLINE for address %2, but it belongs to client with DUID %3
 This informational message is printed when a client attempts to decline
 a lease, but that lease belongs to a different client. The decline request
@@ -239,6 +233,12 @@ the lease after decline-probation-time elapses) will recover automatically.
 However, if the underlying problem is not solved, the conditions leading
 to this message may reappear.
 
+% DHCP6_DECLINE_PROCESS_IA Processing of IA (IAID: %1) from client %2 started.
+This debug message is printed when the server starts processing an IA_NA option
+received in Decline message. It's expected that the option will contain an
+address that is being declined. Specific information will be printed in a
+separate message.
+
 % DHCP6_DYNAMIC_RECONFIGURATION initiate server reconfiguration using file: %1, after receiving SIGHUP signal
 This is the info message logged when the DHCPv6 server starts reconfiguration
 as a result of receiving SIGHUP signal.
@@ -272,6 +272,13 @@ or released leases), but the response will not be send to the client.
 The argument includes the client and transaction identification
 information.
 
+% DHCP6_HOOK_DECLINE_DROP During Decline processing (client=%1, interface=%2, addr=%3) hook callout set status to DROP, dropping packet.
+This message indicates that the server received DECLINE message, it was verified
+to be correct and matching server's lease information. The server called hooks
+for the lease6_decline hook point and one of the callouts set next step status to DROP.
+The server will now abort processing of the packet as if it was never
+received. The lease will continue to be assigned to this client.
+
 % DHCP6_HOOK_DECLINE_SKIP During Decline processing (client=%1, interface=%2, addr=%3) hook callout set status to SKIP, skipping decline.
 This message indicates that the server received DECLINE message, it was verified
 to be correct and matching server's lease information. The server called hooks
@@ -280,13 +287,6 @@ The server will skip the operation of moving the lease to the declined state and
 will continue processing the packet. In particular, it will send a REPLY message
 as if the decline actually took place.
 
-% DHCP6_HOOK_DECLINE_DROP During Decline processing (client=%1, interface=%2, addr=%3) hook callout set status to DROP, dropping packet.
-This message indicates that the server received DECLINE message, it was verified
-to be correct and matching server's lease information. The server called hooks
-for the lease6_decline hook point and one of the callouts set next step status to DROP.
-The server will now abort processing of the packet as if it was never
-received. The lease will continue to be assigned to this client.
-
 % DHCP6_HOOK_LEASE6_RELEASE_NA_SKIP %1: DHCPv6 address lease was not released because a callout set the skip flag
 This debug message is printed when a callout installed on the
 lease6_release hook point set the skip flag. For this particular hook
@@ -644,17 +644,6 @@ etc. The exact reason for rejecting the packet is included in the message.
 % DHCP6_RESPONSE_DATA responding with packet type %1 data is %2
 A debug message listing the data returned to the client.
 
-% DHCP6_USING_SERVERID server is using server-id %1 and stores in the the file %2
-This info message is logged when the server reads its server-id from a
-file or generates it. This message is a notification to the administrator
-what server-id will be used and where it is persisted. Typically, there is
-no need to modify the server id. However, it is possible to do it in the
-Kea configuration file. It is important to understand the implications of
-such modification. The clients will remember previous server-id, and will
-use it to extend their leases. As a result, they will have to go through
-a rebinding phase to re-acquire their leases and associate them with a
-new server id.
-
 % DHCP6_SERVER_FAILED server failed: %1
 The IPv6 DHCP server has encountered a fatal error and is terminating.
 The reason for the failure is included in the message.
@@ -729,3 +718,14 @@ This debug message is printed when server receives a message of unknown type.
 That could either mean missing functionality or invalid or broken relay or client.
 The list of formally defined message types is available here:
 http://www.iana.org/assignments/dhcpv6-parameters.
+
+% DHCP6_USING_SERVERID server is using server-id %1 and stores in the the file %2
+This info message is logged when the server reads its server-id from a
+file or generates it. This message is a notification to the administrator
+what server-id will be used and where it is persisted. Typically, there is
+no need to modify the server id. However, it is possible to do it in the
+Kea configuration file. It is important to understand the implications of
+such modification. The clients will remember previous server-id, and will
+use it to extend their leases. As a result, they will have to go through
+a rebinding phase to re-acquire their leases and associate them with a
+new server id.

src/lib/dhcp_ddns/dhcp_ddns_messages.mes

@@ -77,6 +77,12 @@ This is an error message indicating that an IO error occurred while sending a
 DNS update request to DHCP_DDNS over a UDP socket.  This could indicate a
 network connectivity or system resource issue.
 
+% DHCP_DDNS_UDP_SENDER_WATCH_SOCKET_CLOSE_ERROR watch socket failed to close: %1
+This is an error message that indicates the application was unable to close
+the inbound or outbound side of a NCR sender's watch socket. While technically
+possible the error is highly unlikely to occur and should not impair the
+application's ability to process requests.
+
 % DHCP_DDNS_UNCAUGHT_NCR_RECV_HANDLER_ERROR unexpected exception thrown from the application receive completion handler: %1
 This is an error message that indicates that an exception was thrown but not
 caught in the application's request receive completion handler.  This is a
@@ -88,9 +94,3 @@ This is an error message that indicates that an exception was thrown but not
 caught in the application's send completion handler.  This is a programmatic
 error that needs to be reported.  Dependent upon the nature of the error the
 client may or may not continue operating normally.
-
-% DHCP_DDNS_UDP_SENDER_WATCH_SOCKET_CLOSE_ERROR watch socket failed to close: %1
-This is an error message that indicates the application was unable to close
-the inbound or outbound side of a NCR sender's watch socket. While technically
-possible the error is highly unlikely to occur and should not impair the
-application's ability to process requests.

src/lib/dhcpsrv/alloc_engine_messages.mes

@@ -24,7 +24,7 @@ to DHCP DDNS failed. This name change request is usually generated when
 the lease reclamation routine acts upon expired leases. If a lease being
 reclaimed has a corresponding DNS entry it needs to be removed.
 This message indicates that removal of the DNS entry has failed.
-Nevertheless the lease will be reclaimed. 
+Nevertheless the lease will be reclaimed.
 
 % ALLOC_ENGINE_V4_ALLOC_ERROR %1: error during attempt to allocate an IPv4 address: %2
 An error occurred during an attempt to allocate an IPv4 address, the
@@ -55,13 +55,6 @@ unvailable for a period of time. This time now has elapsed and the address
 has been returned to the available pool. This step concludes decline recovery
 process.
 
-% ALLOC_ENGINE_V6_DECLINED_RECOVERED IPv6 address %1 was recovered after %2 seconds of probation-period
-This informational message indicates that the specified address was reported
-as duplicate (client sent DECLINE) and the server marked this address as
-unvailable for a period of time. This time now has elapsed and the address
-has been returned to the available pool. This step concludes decline recovery
-process.
-
 % ALLOC_ENGINE_V4_DISCOVER_ADDRESS_CONFLICT %1: conflicting reservation for address %2 with existing lease %3
 This warning message is issued when the DHCP server finds that the
 address reserved for the client can't be offered because this address
@@ -75,17 +68,6 @@ client sending the DHCPDISCOVER has a reservation for the specified
 address. The allocation engine will try to offer this address to
 the client.
 
-% ALLOC_ENGINE_V4_LEASE_RECLAIM %1: reclaiming expired lease for address %2
-This debug message is issued when the server begins reclamation of the
-expired DHCPv4 lease. The first argument specifies the client identification
-information. The second argument holds the leased IPv4 address.
-
-% ALLOC_ENGINE_V4_LEASE_RECLAMATION_FAILED failed to reclaim the lease %1: %2
-This error message is logged when the allocation engine fails to
-reclaim an expired lease. The reason for the failure is included in the
-message. The error may be triggered in the lease expiration hook or
-while performing the operation on the lease database.
-
 % ALLOC_ENGINE_V4_LEASES_RECLAMATION_COMPLETE reclaimed %1 leases in %2
 This debug message is logged when the allocation engine completes
 reclamation of a set of expired leases. The maximum number of leases
@@ -125,6 +107,17 @@ been reclaimed, because of the timeout, will be reclaimed when the
 next scheduled reclamation is started. The argument is the timeout
 value expressed in milliseconds.
 
+% ALLOC_ENGINE_V4_LEASE_RECLAIM %1: reclaiming expired lease for address %2
+This debug message is issued when the server begins reclamation of the
+expired DHCPv4 lease. The first argument specifies the client identification
+information. The second argument holds the leased IPv4 address.
+
+% ALLOC_ENGINE_V4_LEASE_RECLAMATION_FAILED failed to reclaim the lease %1: %2
+This error message is logged when the allocation engine fails to
+reclaim an expired lease. The reason for the failure is included in the
+message. The error may be triggered in the lease expiration hook or
+while performing the operation on the lease database.
+
 % ALLOC_ENGINE_V4_NO_MORE_EXPIRED_LEASES all expired leases have been reclaimed
 This debug message is issued when the server reclaims all expired
 DHCPv4 leases in the database.
@@ -295,6 +288,13 @@ reservations for the client but they are not usable because the addresses
 are in use by another client or (c) we had a reserved lease but that
 has now been allocated to another client.
 
+% ALLOC_ENGINE_V6_DECLINED_RECOVERED IPv6 address %1 was recovered after %2 seconds of probation-period
+This informational message indicates that the specified address was reported
+as duplicate (client sent DECLINE) and the server marked this address as
+unvailable for a period of time. This time now has elapsed and the address
+has been returned to the available pool. This step concludes decline recovery
+process.
+
 % ALLOC_ENGINE_V6_EXPIRED_HINT_RESERVED %1: expired lease for the client's hint %2 is reserved for another client
 This message is logged when the allocation engine finds that the
 expired lease for the client's hint can't be reused because it
@@ -345,19 +345,6 @@ reserved for it.
 This informational message signals that the specified client was assigned the prefix
 reserved for it.
 
-% ALLOC_ENGINE_V6_LEASE_RECLAIM %1: reclaiming expired lease for prefix %2/%3
-This debug message is issued when the server begins reclamation of the
-expired DHCPv6 lease. The reclaimed lease may either be an address lease
-or delegated prefix. The first argument provides the client identification
-information. The other arguments specify the prefix and the prefix length
-for the lease. The prefix length for address lease is equal to 128.
-
-% ALLOC_ENGINE_V6_LEASE_RECLAMATION_FAILED failed to reclaim the lease %1: %2
-This error message is logged when the allocation engine fails to
-reclaim an expired lease. The reason for the failure is included in the
-message. The error may be triggered in the lease expiration hook or
-while performing the operation on the lease database.
-
 % ALLOC_ENGINE_V6_LEASES_RECLAMATION_COMPLETE reclaimed %1 leases in %2
 This debug message is logged when the allocation engine completes
 reclamation of a set of expired leases. The maximum number of leases
@@ -397,6 +384,19 @@ been reclaimed, because of the timeout, will be reclaimed when the
 next scheduled reclamation is started. The argument is the timeout
 value expressed in milliseconds.
 
+% ALLOC_ENGINE_V6_LEASE_RECLAIM %1: reclaiming expired lease for prefix %2/%3
+This debug message is issued when the server begins reclamation of the
+expired DHCPv6 lease. The reclaimed lease may either be an address lease
+or delegated prefix. The first argument provides the client identification
+information. The other arguments specify the prefix and the prefix length
+for the lease. The prefix length for address lease is equal to 128.
+
+% ALLOC_ENGINE_V6_LEASE_RECLAMATION_FAILED failed to reclaim the lease %1: %2
+This error message is logged when the allocation engine fails to
+reclaim an expired lease. The reason for the failure is included in the
+message. The error may be triggered in the lease expiration hook or
+while performing the operation on the lease database.
+
 % ALLOC_ENGINE_V6_NO_MORE_EXPIRED_LEASES all expired leases have been reclaimed
 This debug message is issued when the server reclaims all expired
 DHCPv6 leases in the database.

src/lib/dhcpsrv/dhcpsrv_messages.mes

@@ -14,6 +14,13 @@
 
 $NAMESPACE isc::dhcp
 
+% DHCPRSV_MEMFILE_CONVERTING_LEASE_FILES running LFC now to convert lease files to the current schema: %1.%2
+A warning message issued when the server has detected lease files that need
+to be either upgraded or downgraded to match the server's schema, and that
+the server is automatically running the LFC process to perform the conversion.
+This should only occur the first time the server is launched following a Kea
+installation upgrade (or downgrade).
+
 % DHCPSRV_CFGMGR_ADD_IFACE listening on interface %1
 An info message issued when a new interface is being added to the collection of
 interfaces on which the server listens to DHCP messages.
@@ -249,13 +256,6 @@ with the specified address to the memory file backend database.
 The code has issued a commit call.  For the memory file database, this is
 a no-op.
 
-% DHCPRSV_MEMFILE_CONVERTING_LEASE_FILES running LFC now to convert lease files to the current schema: %1.%2
-A warning message issued when the server has detected lease files that need
-to be either upgraded or downgraded to match the server's schema, and that
-the server is automatically running the LFC process to perform the conversion.
-This should only occur the first time the server is launched following a Kea
-installation upgrade (or downgrade).
-
 % DHCPSRV_MEMFILE_DB opening memory file lease database: %1
 This informational message is logged when a DHCP server (either V4 or
 V6) is about to open a memory file lease database.  The parameters of
@@ -454,6 +454,11 @@ V6) is about to open a MySQL lease database.  The parameters of the
 connection including database name and username needed to access it
 (but not the password if any) are logged.
 
+% DHCPSRV_MYSQL_DELETED_EXPIRED_RECLAIMED deleted %1 reclaimed leases from the database
+A debug message issued when the server has removed a number of reclaimed
+leases from the database. The number of removed leases is included in the
+message.
+
 % DHCPSRV_MYSQL_DELETE_ADDR deleting lease for address %1
 A debug message issued when the server is attempting to delete a lease for
 the specified address from the MySQL database for the specified address.
@@ -470,11 +475,6 @@ leases which have expired longer than a specified period of time.
 The argument is the amount of time Kea waits after a reclaimed
 lease expires before considering its removal.
 
-% DHCPSRV_MYSQL_DELETED_EXPIRED_RECLAIMED deleted %1 reclaimed leases from the database
-A debug message issued when the server has removed a number of reclaimed
-leases from the database. The number of removed leases is included in the
-message.
-
 % DHCPSRV_MYSQL_FATAL_ERROR Unrecoverable MySQL error occurred: %1 for <%2>, reason: %3 (error code: %4). Server exiting now!
 An error message indicating that communication with the MySQL database server
 has been lost.  When this occurs the server exits immediately with a non-zero
@@ -589,6 +589,18 @@ unlikely to occur or negatively impact server operation.
 A debug message issued when the server is attempting to delete a lease for
 the specified address from the PostgreSQL database for the specified address.
 
+% DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED4 deleting reclaimed IPv4 leases that expired more than %1 seconds ago
+A debug message issued when the server is removing reclaimed DHCPv4
+leases which have expired longer than a specified period of time.
+The argument is the amount of time Kea waits after a reclaimed
+lease expires before considering its removal.
+
+% DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED6 deleting reclaimed IPv6 leases that expired more than %1 seconds ago
+A debug message issued when the server is removing reclaimed DHCPv6
+leases which have expired longer than a specified period of time.
+The argument is the amount of time Kea waits after a reclaimed
+lease expires before considering its removal.
+
 % DHCPSRV_PGSQL_FATAL_ERROR Unrecoverable PostgreSQL error occurred: Statement: <%1>, reason: %2 (error code: %3). Server exiting now!
 An error message indicating that communication with the MySQL database server
 has been lost.  When this occurs the server exits immediately with a non-zero
@@ -617,18 +629,6 @@ A debug message issued when the server is attempting to obtain expired
 IPv6 leases to reclaim them. The maximum number of leases to be retrieved
 is logged in the message.
 
-% DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED4 deleting reclaimed IPv4 leases that expired more than %1 seconds ago
-A debug message issued when the server is removing reclaimed DHCPv4
-leases which have expired longer than a specified period of time.
-The argument is the amount of time Kea waits after a reclaimed
-lease expires before considering its removal.
-
-% DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED6 deleting reclaimed IPv6 leases that expired more than %1 seconds ago
-A debug message issued when the server is removing reclaimed DHCPv6
-leases which have expired longer than a specified period of time.
-The argument is the amount of time Kea waits after a reclaimed
-lease expires before considering its removal.
-
 % DHCPSRV_PGSQL_GET_HWADDR obtaining IPv4 leases for hardware address %1
 A debug message issued when the server is attempting to obtain a set
 of IPv4 leases from the PostgreSQL database for a client with the specified