Changeset 43:2db15632a63d in freeDiameter for include

Timestamp:

Nov 25, 2009, 7:07:09 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added a large part of connection establishment logic, to test

Location:

include/freeDiameter

Files:

• freeDiameter.h (modified) (3 diffs)
• libfreeDiameter.h (modified) (5 diffs)

include/freeDiameter/freeDiameter.h

@@ -336 +336 @@
                 int             pir_relay;      /* The remote peer advertized the relay application */
                 struct fd_list  pir_apps;       /* applications advertised by the remote peer, except relay (pi_flags.relay) */
+                int             pir_isi;        /* Inband-Security-Id advertised (PI_SEC_* bits) */
                 
                 int             pir_proto;      /* The L4 protocol currently used with the peer (IPPROTO_TCP or IPPROTO_SCTP) */
@@ -423 +424 @@
  * after the CER is received. An extension must register such callback with peer_validate_register.
  *
- *   If (info->pi_flags.sec == PI_SEC_TLS_OLD) the extension may instruct the daemon explicitely
- * to not use TLS by clearing info->pi_flags.inband_tls -- only if inband_none is set.
- *
- *   If (info->pi_flags.sec == PI_SEC_TLS_OLD) and info->pi_flags.inband_tls is set,
+ *   The callback can learn if the peer has sent Inband-Security-Id AVPs in runtime.pir_isi fields.
+ * It can also learn if a handshake has already been performed in runtime.pir_cert_list field.
+ * The callback must set the value of config.pic_flags.sec appropriately to allow a connection without TLS.
+ *
+ *   If the old TLS mechanism is used,
  * the extension may also need to check the credentials provided during the TLS
  * exchange (remote certificate). For this purpose, it may set the address of a new callback
  * to be called once the handshake is completed. This new callback receives the information
- * structure as parameter (with pi_sec_data set) and returns 0 if the credentials are correct,
+ * structure as parameter (with pir_cert_list set) and returns 0 if the credentials are correct,
  * or an error code otherwise. If the error code is received, the connection is closed and the 
  * peer is destroyed.
@@ -545 +547 @@
 void fd_ep_dump( int indent, struct fd_list * eps );
 
+/***************************************/
+/*   Applications lists helpers        */
+/***************************************/
+
+int fd_app_merge(struct fd_list * list, application_id_t aid, vendor_id_t vid, int auth, int acct);
+int fd_app_find_common(struct fd_list * target, struct fd_list * reference);
+int fd_app_gotcommon(struct fd_list * apps);
+
 #endif /* _FREEDIAMETER_H */

include/freeDiameter/libfreeDiameter.h

@@ -718 +718 @@
  }
                  
- 
 */
+                
+/* Special function: */
+uint32_t * fd_dict_get_vendorid_list(struct dictionary * dict);
          
 /*
@@ -1329 +1331 @@
                 
 /* Define some hard-coded values */
+/* Application */
+#define AI_RELAY                        0xffffffff
+
 /* Commands Codes */
 #define CC_CAPABILITIES_EXCHANGE        257
@@ -1369 +1374 @@
 #define AC_ORIGIN_REALM                 296
 #define AC_INBAND_SECURITY_ID           299
+#define ACV_ISI_NO_INBAND_SECURITY              0
+#define ACV_ISI_TLS                             1
 
 /* Error codes */
@@ -2426 +2433 @@
  *
  * PARAMETERS:
- *  old         : Location of a FIFO that is to be emptied and deleted.
+ *  old         : Location of a FIFO that is to be emptied.
  *  new         : A FIFO that will receive the old data.
  *  loc_update  : if non NULL, a place to store the pointer to new FIFO atomically with the move.
  *
  * DESCRIPTION: 
- *  Delete a queue and move its content to another one atomically.
+ *  Empties a queue and move its content to another one atomically.
  *
  * RETURN VALUE:
@@ -2437 +2444 @@
  *  EINVAL      : A parameter is invalid.
  */
-int fd_fifo_move ( struct fifo ** old, struct fifo * new, struct fifo ** loc_update );
+int fd_fifo_move ( struct fifo * old, struct fifo * new, struct fifo ** loc_update );
 
 /*