[v1_1_0] *.mes files reorder

src/bin/dhcp4/dhcp4_messages.mes

@@ -201,10 +201,6 @@ a client's error or a server's purged database.
 % DHCP4_DHCP4O6_BAD_PACKET received malformed DHCPv4o6 packet: %1
 A malformed DHCPv4o6 packet was received.
 
-% DHCP6_DHCP4O6_PACKET_RECEIVED received DHCPv4o6 packet from DHCPv6 server (type %1) for %2 on interface %3
-This debug message is printed when the server is receiving a DHCPv4o6
-from the DHCPv6 server over inter-process communication.
-
 % DHCP4_DHCP4O6_PACKET_SEND %1: trying to send packet %2 (type %3) to %4 on interface %5 encapsulating %6: %7 (type %8)
 The arguments specify the client identification information (HW address
 and client identifier), DHCPv6 message name and type, source IPv6
@@ -701,3 +697,7 @@ will drop its message if the received message was DHCPDISCOVER,
 and will send DHCPNAK if the received message was DHCPREQUEST.
 The argument includes the client and the transaction identification
 information.
+
+% DHCP6_DHCP4O6_PACKET_RECEIVED received DHCPv4o6 packet from DHCPv6 server (type %1) for %2 on interface %3
+This debug message is printed when the server is receiving a DHCPv4o6
+from the DHCPv6 server over inter-process communication.

src/bin/dhcp6/dhcp6_messages.mes

@@ -145,12 +145,6 @@ to the server. The first argument includes the client and
 transaction identification information. The second argument includes
 the generated FQDN.
 
-% DHCP6_DDNS_GENERATE_FQDN %1: client did not send a FQDN option; FQDN will be
-generated for the client.
-This debug message is issued when the server did not receive a FQDN option
-from the client and client name replacement is enabled.  This provides a means
-to create DNS entries for unsophisticated clients.
-
 % DHCP6_DDNS_GENERATED_FQDN_UPDATE_FAIL %1: failed to update the lease using address %2, after generating FQDN for a client, reason: %3
 This message indicates the failure when trying to update the lease and/or
 options in the server's response with the hostname generated by the server
@@ -158,6 +152,12 @@ from the acquired address. The first argument includes the client and the
 transaction identification information. The second argument is a leased
 address. The third argument includes the reason for the failure.
 
+% DHCP6_DDNS_GENERATE_FQDN %1: client did not send a FQDN option; FQDN will be
+generated for the client.
+This debug message is issued when the server did not receive a FQDN option
+from the client and client name replacement is enabled.  This provides a means
+to create DNS entries for unsophisticated clients.
+
 % DHCP6_DDNS_LEASE_RENEW_FQDN_CHANGE FQDN %1: FQDN for the renewed lease: %2 has changed. New values: hostname = %3, reverse mapping = %4, forward mapping = %5
 This debug message is logged when FQDN mapping for a particular lease has been
 changed by the recent Renew message. This mapping will be changed in DNS.
@@ -380,14 +380,6 @@ be many reasons for such failure. Each failure is logged in a separate
 log entry. The first argument holds the client and transaction identification
 information. The second argument holds the IAID.
 
-% DHCP6_LEASE_RENEW %1: lease for address %2 and iaid=%3 has been allocated
-This informational message indicates that in response to a client's REQUEST
-message, the server successfully renewed a non-temporary address
-lease. This is a normal behavior and indicates successful operation.
-The first argument includes the client and transaction identification
-information. The remaining arguments hold the allocated address and
-IAID.
-
 % DHCP6_LEASE_DATA %1: detailed lease information for iaid=%2: %3
 This debug message is used to print the detailed information about the
 allocated lease or a lease which will be advertised to the client.
@@ -414,6 +406,14 @@ first argument includes client and transaction identification
 information. The second and third argument hold the prefix and the
 prefix length.
 
+% DHCP6_LEASE_RENEW %1: lease for address %2 and iaid=%3 has been allocated
+This informational message indicates that in response to a client's REQUEST
+message, the server successfully renewed a non-temporary address
+lease. This is a normal behavior and indicates successful operation.
+The first argument includes the client and transaction identification
+information. The remaining arguments hold the allocated address and
+IAID.
+
 % DHCP6_NOT_RUNNING IPv6 DHCP server is not running
 A warning message is issued when an attempt is made to shut down the
 IPv6 DHCP server but it is not running.

src/lib/dhcpsrv/dhcpsrv_messages.mes

@@ -164,6 +164,108 @@ the database access parameters are changed: in the latter case, the
 server closes the currently open database, and opens a database using
 the new parameters.
 
+% DHCPSRV_CQL_ADD_ADDR4 adding IPv4 lease with address %1
+A debug message issued when the server is about to add an IPv4 lease
+with the specified address to the Cassandra backend database.
+
+% DHCPSRV_CQL_ADD_ADDR6 adding IPv6 lease with address %1
+A debug message issued when the server is about to add an IPv6 lease
+with the specified address to the Cassandra backend database.
+
+% DHCPSRV_CQL_COMMIT committing to Cassandra database
+A commit call been issued on the server. For Cassandra, this is a no-op.
+
+% DHCPSRV_CQL_DB opening Cassandra lease database: %1
+This informational message is logged when a DHCP server (either V4 or
+V6) is about to open a Cassandra 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_CQL_DELETE_ADDR deleting lease for address %1
+A debug message issued when the server is attempting to delete a lease from the
+Cassandra database for the specified address.
+
+% DHCPSRV_CQL_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_CQL_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_CQL_GET_ADDR4 obtaining IPv4 lease for address %1
+A debug message issued when the server is attempting to obtain an IPv4
+lease from the Cassandra database for the specified address.
+
+% DHCPSRV_CQL_GET_ADDR6 obtaining IPv6 lease for address %1 and lease type %2
+A debug message issued when the server is attempting to obtain an IPv6
+lease from the Cassandra database for the specified address.
+
+% DHCPSRV_CQL_GET_CLIENTID obtaining IPv4 leases for client ID %1
+A debug message issued when the server is attempting to obtain a set of
+IPv4 leases from the Cassandra database for a client with the specified
+client identification.
+
+% DHCPSRV_CQL_GET_CLIENTID_HWADDR_SUBID obtaining IPv4 lease for client ID %1, hardware address %2 and subnet ID %3
+A debug message issued when the server is attempting to obtain an IPv4
+lease from the Cassandra database for a client with the specified
+client ID, hardware address and subnet ID.
+
+% DHCPSRV_CQL_GET_EXPIRED4 obtaining maximum %1 of expired IPv4 leases
+A debug message issued when the server is attempting to obtain expired
+IPv4 leases to reclaim them. The maximum number of leases to be retrieved
+is logged in the message.
+
+% DHCPSRV_CQL_GET_EXPIRED6 obtaining maximum %1 of expired IPv6 leases
+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_CQL_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 Cassandra database for a client with the specified
+hardware address.
+
+% DHCPSRV_CQL_GET_IAID_DUID obtaining IPv6 leases for IAID %1 and DUID %2 and lease type %3
+A debug message issued when the server is attempting to obtain a set of IPv6
+leases from the Cassandra database for a client with the specified IAID
+(Identity Association ID) and DUID (DHCP Unique Identifier).
+
+% DHCPSRV_CQL_GET_IAID_SUBID_DUID obtaining IPv6 leases for IAID %1, Subnet ID %2, DUID %3 and lease type %4
+A debug message issued when the server is attempting to obtain an IPv6
+lease from the Cassandra database for a client with the specified IAID
+(Identity Association ID), Subnet ID and DUID (DHCP Unique Identifier).
+
+% DHCPSRV_CQL_GET_SUBID_CLIENTID obtaining IPv4 lease for subnet ID %1 and client ID %2
+A debug message issued when the server is attempting to obtain an IPv4
+lease from the Cassandra database for a client with the specified
+subnet ID and client ID.
+
+% DHCPSRV_CQL_GET_SUBID_HWADDR obtaining IPv4 lease for subnet ID %1 and hardware address %2
+A debug message issued when the server is attempting to obtain an IPv4
+lease from the Cassandra database for a client with the specified
+subnet ID and hardware address.
+
+% DHCPSRV_CQL_GET_VERSION obtaining schema version information
+A debug message issued when the server is about to obtain schema version
+information from the Cassandra database.
+
+% DHCPSRV_CQL_ROLLBACK rolling back Cassandra database
+The code has issued a rollback call. For Cassandra, this is
+a no-op.
+
+% DHCPSRV_CQL_UPDATE_ADDR4 updating IPv4 lease for address %1
+A debug message issued when the server is attempting to update IPv4
+lease from the Cassandra database for the specified address.
+
+% DHCPSRV_CQL_UPDATE_ADDR6 updating IPv6 lease for address %1
+A debug message issued when the server is attempting to update IPv6
+lease from the Cassandra database for the specified address.
+
 % DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET received bad DHCPv4o6 packet: %1
 A bad DHCPv4o6 packet was received.
 
@@ -640,10 +742,6 @@ 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
 exit code.  This is most likely due to a network issue.
 
-% DHCPSRV_PGSQL_HOST_DB_GET_VERSION obtaining schema version information for the PostgreSQL hosts database
-A debug message issued when the server is about to obtain schema version
-information from the PostgreSQL hosts database.
-
 % DHCPSRV_PGSQL_GET_ADDR4 obtaining IPv4 lease for address %1
 A debug message issued when the server is attempting to obtain an IPv4
 lease from the PostgreSQL database for the specified address.
@@ -702,6 +800,10 @@ V6) is about to open a PostgreSQL hosts database.  The parameters of the
 connection including database name and username needed to access it
 (but not the password if any) are logged.
 
+% DHCPSRV_PGSQL_HOST_DB_GET_VERSION obtaining schema version information for the PostgreSQL hosts database
+A debug message issued when the server is about to obtain schema version
+information from the PostgreSQL hosts database.
+
 % DHCPSRV_PGSQL_HOST_DB_READONLY PostgreSQL host database opened for read access only
 This informational message is issued when the user has configured the PostgreSQL
 database in read-only mode. Kea will not be able to insert or modify
@@ -833,105 +935,3 @@ indicate an error in the source code, please submit a bug report.
 % DHCPSRV_UNKNOWN_DB unknown database type: %1
 The database access string specified a database type (given in the
 message) that is unknown to the software.  This is a configuration error.
-
-% DHCPSRV_CQL_ADD_ADDR4 adding IPv4 lease with address %1
-A debug message issued when the server is about to add an IPv4 lease
-with the specified address to the Cassandra backend database.
-
-% DHCPSRV_CQL_ADD_ADDR6 adding IPv6 lease with address %1
-A debug message issued when the server is about to add an IPv6 lease
-with the specified address to the Cassandra backend database.
-
-% DHCPSRV_CQL_COMMIT committing to Cassandra database
-A commit call been issued on the server. For Cassandra, this is a no-op.
-
-% DHCPSRV_CQL_DB opening Cassandra lease database: %1
-This informational message is logged when a DHCP server (either V4 or
-V6) is about to open a Cassandra 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_CQL_DELETE_ADDR deleting lease for address %1
-A debug message issued when the server is attempting to delete a lease from the
-Cassandra database for the specified address.
-
-% DHCPSRV_CQL_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_CQL_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_CQL_GET_ADDR4 obtaining IPv4 lease for address %1
-A debug message issued when the server is attempting to obtain an IPv4
-lease from the Cassandra database for the specified address.
-
-% DHCPSRV_CQL_GET_ADDR6 obtaining IPv6 lease for address %1 and lease type %2
-A debug message issued when the server is attempting to obtain an IPv6
-lease from the Cassandra database for the specified address.
-
-% DHCPSRV_CQL_GET_CLIENTID obtaining IPv4 leases for client ID %1
-A debug message issued when the server is attempting to obtain a set of
-IPv4 leases from the Cassandra database for a client with the specified
-client identification.
-
-% DHCPSRV_CQL_GET_CLIENTID_HWADDR_SUBID obtaining IPv4 lease for client ID %1, hardware address %2 and subnet ID %3
-A debug message issued when the server is attempting to obtain an IPv4
-lease from the Cassandra database for a client with the specified
-client ID, hardware address and subnet ID.
-
-% DHCPSRV_CQL_GET_EXPIRED4 obtaining maximum %1 of expired IPv4 leases
-A debug message issued when the server is attempting to obtain expired
-IPv4 leases to reclaim them. The maximum number of leases to be retrieved
-is logged in the message.
-
-% DHCPSRV_CQL_GET_EXPIRED6 obtaining maximum %1 of expired IPv6 leases
-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_CQL_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 Cassandra database for a client with the specified
-hardware address.
-
-% DHCPSRV_CQL_GET_IAID_DUID obtaining IPv6 leases for IAID %1 and DUID %2 and lease type %3
-A debug message issued when the server is attempting to obtain a set of IPv6
-leases from the Cassandra database for a client with the specified IAID
-(Identity Association ID) and DUID (DHCP Unique Identifier).
-
-% DHCPSRV_CQL_GET_IAID_SUBID_DUID obtaining IPv6 leases for IAID %1, Subnet ID %2, DUID %3 and lease type %4
-A debug message issued when the server is attempting to obtain an IPv6
-lease from the Cassandra database for a client with the specified IAID
-(Identity Association ID), Subnet ID and DUID (DHCP Unique Identifier).
-
-% DHCPSRV_CQL_GET_SUBID_CLIENTID obtaining IPv4 lease for subnet ID %1 and client ID %2
-A debug message issued when the server is attempting to obtain an IPv4
-lease from the Cassandra database for a client with the specified
-subnet ID and client ID.
-
-% DHCPSRV_CQL_GET_SUBID_HWADDR obtaining IPv4 lease for subnet ID %1 and hardware address %2
-A debug message issued when the server is attempting to obtain an IPv4
-lease from the Cassandra database for a client with the specified
-subnet ID and hardware address.
-
-% DHCPSRV_CQL_GET_VERSION obtaining schema version information
-A debug message issued when the server is about to obtain schema version
-information from the Cassandra database.
-
-% DHCPSRV_CQL_ROLLBACK rolling back Cassandra database
-The code has issued a rollback call. For Cassandra, this is
-a no-op.
-
-% DHCPSRV_CQL_UPDATE_ADDR4 updating IPv4 lease for address %1
-A debug message issued when the server is attempting to update IPv4
-lease from the Cassandra database for the specified address.
-
-% DHCPSRV_CQL_UPDATE_ADDR6 updating IPv6 lease for address %1
-A debug message issued when the server is attempting to update IPv6
-lease from the Cassandra database for the specified address.

src/lib/eval/eval_messages.mes

@@ -14,6 +14,7 @@ the value stack.  Then are then combined via logical and and
 the result is pushed onto the value stack.
 
 # For use with TokenConcat
+
 % EVAL_DEBUG_CONCAT Popping %1 and %2 pushing %3
 This debug message indicates that the two strings are being popped off
 of the stack.  They are then concatenated and the resulting string is
@@ -21,23 +22,27 @@ pushed onto the stack.  The strings are displayed in hex.
 
 # For use with TokenEqual
 # Start with binary for the inputs for now, we may add text in the future.
+
 % EVAL_DEBUG_EQUAL Popping %1 and %2 pushing result %3
 This debug message indicates that the two strings are being popped off
 of the value stack and the result of comparing them is being pushed onto
 the value stack.  The strings are displayed in hex.
 
 # For use with TokenHexString
+
 % EVAL_DEBUG_HEXSTRING Pushing hex string %1
 This debug message indicates that the given binary string is being pushed
 onto the value stack.  The string is displayed in hex.
 
 # For use with TokenIpAddress
+
 % EVAL_DEBUG_IPADDRESS Pushing IPAddress %1
 This debug message indicates that the given binary string is being pushed
 onto the value stack.  This represents either an IPv4 or IPv6 address.
 The string is displayed in hex.
 
 # For use with TokenNot
+
 % EVAL_DEBUG_NOT Popping %1 pushing %2
 This debug message indicates that the first value is popped from
 the value stack, negated and then pushed onto the value stack.
@@ -45,6 +50,7 @@ The string is displayed in text.
 
 # For use with TokenOption based classes.  These include TokenOpton,
 # TokenRelay4Option and TokenRelay6Option.
+
 % EVAL_DEBUG_OPTION Pushing option %1 with value %2
 This debug message indicates that the given string representing the
 value of the requested option is being pushed onto the value stack.
@@ -54,6 +60,7 @@ the requested type is .exists.  The option code may be for either an
 option or a sub-option as requested in the classification statement.
 
 # For use with TokenOr
+
 % EVAL_DEBUG_OR Popping %1 and %2 pushing %3
 This debug message indicates that two values are popped from
 the value stack.  Then are then combined via logical or and
@@ -61,24 +68,28 @@ the result is pushed onto the value stack. The string is displayed
 in text.
 
 # For use with TokenPkt
+
 % EVAL_DEBUG_PKT Pushing PKT meta data %1 with value %2
 This debug message indicates that the given binary string representing
 the value of the requested meta data is being pushed onto the value stack.
 The string is displayed in hex at the exception of interface name.
 
 # For use with TokenPkt4
+
 % EVAL_DEBUG_PKT4 Pushing PKT4 field %1 with value %2
 This debug message indicates that the given binary string representing
 the value of the requested field is being pushed onto the value stack.
 The string is displayed in hex.
 
 # For use with TokenPkt6
+
 % EVAL_DEBUG_PKT6 Pushing PKT6 field %1 with value %2
 This debug message indicates that the given binary string representing
 the value of the requested field is being pushed onto the value stack.
 The string is displayed in hex.
 
 # For use with TokenRelay6Field
+
 % EVAL_DEBUG_RELAY6 Pushing PKT6 relay field %1 nest %2 with value %3
 This debug message indicates that the given binary string representing
 the value of the requested fied is being pushed onto the value stack.
@@ -89,12 +100,14 @@ This debug message is generated if the nest field is out of range.  The
 empty string will always be the value pushed onto the stack.
 
 # For use with TokenString
+
 % EVAL_DEBUG_STRING Pushing text string %1
 This debug message indicates that the given text string is being pushed
 onto the value stack.  The string is displayed in text.
 
 # For use with TokenSubstring
 # Start with binary for the strings for now, we may add text in the future.
+
 % EVAL_DEBUG_SUBSTRING Popping length %1, start %2, string %3 pushing result %4
 This debug message indicates that three values are being popped from
 the value stack and a result is being pushed onto the value stack.  The