Navigation

Changeset 620:bc7328e600f0 in freeDiameter


Ignore:
Timestamp:
Dec 6, 2010, 2:45:49 PM (13 years ago)
Author:
Sebastien Decugis <sdecugis@nict.go.jp>
Branch:
default
Phase:
public
Message:

Removed the OUTPUT specification for SWIG, too complex

Location:
include/freeDiameter
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • include/freeDiameter/freeDiameter.h

    r618 r620  
    327327 * !0   : An error occurred.
    328328 */
    329 int fd_peer_getbyid( char * diamid, struct peer_hdr ** S_OUT(peer) );
     329int fd_peer_getbyid( char * diamid, struct peer_hdr ** peer );
    330330
    331331/*
    … …  
    550550 *  ENOMEM      : Not enough memory to complete the operation
    551551 */
    552 int fd_rt_fwd_register ( int (*rt_fwd_cb)(void * cbdata, struct msg ** msg), void * cbdata, enum fd_rt_fwd_dir dir, struct fd_rt_fwd_hdl ** S_OUT(handler) );
     552int fd_rt_fwd_register ( int (*rt_fwd_cb)(void * cbdata, struct msg ** msg), void * cbdata, enum fd_rt_fwd_dir dir, struct fd_rt_fwd_hdl ** handler );
    553553/*
    554554 * CALLBACK:    rt_fwd_cb
    … …  
    624624 *  ENOMEM      : Not enough memory to complete the operation
    625625 */
    626 int fd_rt_out_register ( int (*rt_out_cb)(void * cbdata, struct msg * msg, struct fd_list * candidates), void * cbdata, int priority, struct fd_rt_out_hdl ** S_OUT(handler) );
     626int fd_rt_out_register ( int (*rt_out_cb)(void * cbdata, struct msg * msg, struct fd_list * candidates), void * cbdata, int priority, struct fd_rt_out_hdl ** handler );
    627627/*
    628628 * CALLBACK:    rt_out_cb
    … …  
    684684
    685685int fd_event_send(struct fifo *queue, int code, size_t datasz, void * data);
    686 int fd_event_get(struct fifo *queue, int * S_OUT(code), size_t * S_OUT(datasz), void ** S_OUT(data));
    687 int fd_event_timedget(struct fifo *queue, struct timespec * timeout, int timeoutcode, int * S_OUT(code), size_t * S_OUT(datasz), void ** S_OUT(data));
     686int fd_event_get(struct fifo *queue, int * code, size_t * datasz, void ** data);
     687int fd_event_timedget(struct fifo *queue, struct timespec * timeout, int timeoutcode, int * code, size_t * datasz, void ** data);
    688688void fd_event_destroy(struct fifo **queue, void (*free_cb)(void * data));
    689689const char * fd_ev_str(int event);
    … …  
    744744int fd_app_merge(struct fd_list * list, application_id_t aid, vendor_id_t vid, int auth, int acct);
    745745int fd_app_check(struct fd_list * list, application_id_t aid, struct fd_app **detail);
    746 int fd_app_check_common(struct fd_list * list1, struct fd_list * list2, int * S_OUT(common_found));
     746int fd_app_check_common(struct fd_list * list1, struct fd_list * list2, int * common_found);
    747747int fd_app_empty(struct fd_list * list);
    748748

  • include/freeDiameter/libfreeDiameter.h

    r618 r620  
    7777#include <libgen.h>     /* for basename if --dbg_file is specified */
    7878#endif /* DEBUG */
    79 
    80 #ifdef SWIG
    81 #define S_INOUT(_p_) INOUT
    82 #define S_OUT(_p_) OUTPUT
    83 #else /* SWIG */
    84 #define S_INOUT(_p_) _p_
    85 #define S_OUT(_p_) _p_
    86 #endif /* SWIG */
    8779
    8880/*============================================================*/
    … …  
    708700#define FD_LIST_INITIALIZER_O( _list_name, _obj ) \
    709701        { .next = & _list_name, .prev = & _list_name, .head = & _list_name, .o = _obj }
    710 #ifdef SWIG
    711 %apply struct fd_list * OUTPUT { struct fd_list * list };
    712702void fd_list_init ( struct fd_list * list, void * obj );
    713 %clear struct fd_list * list;
    714 #else
    715 void fd_list_init ( struct fd_list * list, void * obj );
    716 #endif
    717703
    718704/* Return boolean, true if the list is empty */
    … …  
    793779 *    ENOMEM    : Memory allocation for the new object element failed.)
    794780 */
    795 int fd_dict_new ( struct dictionary * dict, enum dict_object_type type, void * data, struct dict_object * parent, struct dict_object ** S_OUT(ref) );
     781int fd_dict_new ( struct dictionary * dict, enum dict_object_type type, void * data, struct dict_object * parent, struct dict_object ** ref );
    796782
    797783/*
    … …  
    818804 *  ENOENT      : No matching object has been found, and result was NULL.
    819805 */
    820 int fd_dict_search ( struct dictionary * dict, enum dict_object_type type, int criteria, void * what, struct dict_object ** S_OUT(result), int retval );
     806int fd_dict_search ( struct dictionary * dict, enum dict_object_type type, int criteria, void * what, struct dict_object ** result, int retval );
    821807
    822808/* Special case: get the generic error command object */
    823 int fd_dict_get_error_cmd(struct dictionary * dict, struct dict_object ** S_OUT(obj));
     809int fd_dict_get_error_cmd(struct dictionary * dict, struct dict_object ** obj);
    824810
    825811/*
    … …  
    839825 *  EINVAL      : A parameter is invalid.
    840826 */
    841 int fd_dict_getval ( struct dict_object * object, void * S_INOUT(val));
    842 int fd_dict_gettype ( struct dict_object * object, enum dict_object_type * S_OUT(type));
    843 int fd_dict_getdict ( struct dict_object * object, struct dictionary ** S_OUT(dict));
     827int fd_dict_getval ( struct dict_object * object, void * val);
     828int fd_dict_gettype ( struct dict_object * object, enum dict_object_type * type);
     829int fd_dict_getdict ( struct dict_object * object, struct dictionary ** dict);
    844830
    845831/* Debug functions */
    … …  
    16171603 *  ENOMEM      : Not enough memory to complete the operation
    16181604 */
    1619 int fd_sess_handler_create_internal ( struct session_handler ** S_OUT(handler), void (*cleanup)(session_state * state, char * sid) );
     1605int fd_sess_handler_create_internal ( struct session_handler ** handler, void (*cleanup)(session_state * state, char * sid) );
    16201606/* Macro to avoid casting everywhere */
    16211607#define fd_sess_handler_create( _handler, _cleanup ) \
    … …  
    16651651 *  ENOMEM      : Not enough memory to complete the operation
    16661652 */
    1667 int fd_sess_new ( struct session ** S_OUT(session), char * diamId, char * opt, size_t optlen );
     1653int fd_sess_new ( struct session ** session, char * diamId, char * opt, size_t optlen );
    16681654
    16691655/*
    … …  
    16851671 *  ENOMEM      : Not enough memory to complete the operation
    16861672 */
    1687 int fd_sess_fromsid ( char * sid, size_t len, struct session ** S_OUT(session), int * S_OUT(new));
     1673int fd_sess_fromsid ( char * sid, size_t len, struct session ** session, int * new);
    16881674
    16891675/*
    … …  
    17041690 *  EINVAL      : A parameter is invalid.
    17051691 */
    1706 int fd_sess_getsid ( struct session * session, char ** S_OUT(sid) );
     1692int fd_sess_getsid ( struct session * session, char ** sid );
    17071693
    17081694/*
    … …  
    18051791 *  EINVAL      : A parameter is invalid.
    18061792 */
    1807 int fd_sess_state_retrieve_internal ( struct session_handler * handler, struct session * session, session_state ** S_OUT(state) );
     1793int fd_sess_state_retrieve_internal ( struct session_handler * handler, struct session * session, session_state ** state );
    18081794#define fd_sess_state_retrieve( _handler, _session, _state ) \
    18091795        fd_sess_state_retrieve_internal( (_handler), (_session), (void *)(_state) )
    … …  
    18251811
    18261812/* Following functions are helpers to create the routing data of a message */
    1827 int  fd_rtd_init(struct rt_data ** S_OUT(rtd));
     1813int  fd_rtd_init(struct rt_data ** rtd);
    18281814void fd_rtd_free(struct rt_data ** rtd);
    18291815
    … …  
    18351821
    18361822/* Extract the list of valid candidates, and initialize their scores to 0 */
    1837 void fd_rtd_candidate_extract(struct rt_data * rtd, struct fd_list ** S_OUT(candidates), int ini_score);
     1823void fd_rtd_candidate_extract(struct rt_data * rtd, struct fd_list ** candidates, int ini_score);
    18381824
    18391825/* If a peer returned a protocol error for this message, save it so that we don't try to send it there again */
    … …  
    19491935 *    ENOMEM    : Memory allocation for the new avp failed.)
    19501936 */
    1951 int fd_msg_avp_new ( struct dict_object * model, int flags, struct avp ** S_OUT(avp) );
     1937int fd_msg_avp_new ( struct dict_object * model, int flags, struct avp ** avp );
    19521938
    19531939/*
    … …  
    19681954 *    ENOMEM    : Memory allocation for the new message failed.)
    19691955 */
    1970 int fd_msg_new ( struct dict_object * model, int flags, struct msg ** S_OUT(msg) );
     1956int fd_msg_new ( struct dict_object * model, int flags, struct msg ** msg );
    19711957
    19721958/*
    … …  
    19891975 *  !0          : an error occurred.
    19901976 */
    1991 int fd_msg_new_answer_from_req ( struct dictionary * dict, struct msg ** S_INOUT(msg), int flag );
     1977int fd_msg_new_answer_from_req ( struct dictionary * dict, struct msg ** msg, int flag );
    19921978
    19931979/*
    … …  
    20131999 *  ENOENT      : No element has been found where requested, and "found" was NULL (otherwise, *found is set to NULL and 0 is returned).
    20142000 */
    2015 int fd_msg_browse_internal ( msg_or_avp * reference, enum msg_brw_dir dir, msg_or_avp ** S_OUT(found), int * S_INOUT(depth) );
     2001int fd_msg_browse_internal ( msg_or_avp * reference, enum msg_brw_dir dir, msg_or_avp ** found, int * depth );
    20162002/* Macro to avoid having to cast the third parameter everywhere */
    20172003#define fd_msg_browse( ref, dir, found, depth ) \
    … …  
    20572043 *  ENOENT      : No AVP has been found, and "avp" was NULL (otherwise, *avp is set to NULL and 0 returned).
    20582044 */
    2059 int fd_msg_search_avp ( struct msg * msg, struct dict_object * what, struct avp ** S_OUT(avp) );
     2045int fd_msg_search_avp ( struct msg * msg, struct dict_object * what, struct avp ** avp );
    20602046
    20612047/*
    … …  
    21142100 *  EINVAL      : A parameter is invalid.
    21152101 */
    2116 int fd_msg_model ( msg_or_avp * reference, struct dict_object ** S_OUT(model) );
     2102int fd_msg_model ( msg_or_avp * reference, struct dict_object ** model );
    21172103
    21182104/*
    … …  
    21302116 *  EINVAL      : A parameter is invalid.
    21312117 */
    2132 int fd_msg_hdr ( struct msg *msg, struct msg_hdr ** S_OUT(pdata) );
     2118int fd_msg_hdr ( struct msg *msg, struct msg_hdr ** pdata );
    21332119
    21342120/*
    … …  
    21462132 *  EINVAL      : A parameter is invalid.
    21472133 */
    2148 int fd_msg_avp_hdr ( struct avp *avp, struct avp_hdr ** S_OUT(pdata) );
     2134int fd_msg_avp_hdr ( struct avp *avp, struct avp_hdr ** pdata );
    21492135
    21502136/*
    … …  
    21672153 */
    21682154int fd_msg_answ_associate( struct msg * answer, struct msg * query );
    2169 int fd_msg_answ_getq     ( struct msg * answer, struct msg ** S_OUT(query) );
     2155int fd_msg_answ_getq     ( struct msg * answer, struct msg ** query );
    21702156int fd_msg_answ_detach   ( struct msg * answer );
    21712157
    … …  
    22092195int fd_msg_rt_associate( struct msg * msg, struct rt_data ** rtd );
    22102196#endif /* !SWIG */
    2211 int fd_msg_rt_get      ( struct msg * msg, struct rt_data ** S_OUT(rtd) );
     2197int fd_msg_rt_get      ( struct msg * msg, struct rt_data ** rtd );
    22122198
    22132199/*
    … …  
    22492235int fd_msg_source_set( struct msg * msg, char * diamid, int add_rr, struct dictionary * dict );
    22502236#endif /* !SWIG */
    2251 int fd_msg_source_get( struct msg * msg, char ** S_OUT(diamid) );
     2237int fd_msg_source_get( struct msg * msg, char ** diamid );
    22522238
    22532239/*
    … …  
    22842270 * !0 : standard error code.
    22852271 */
    2286 int fd_msg_sess_get(struct dictionary * dict, struct msg * msg, struct session ** S_OUT(session), int * S_OUT(new));
     2272int fd_msg_sess_get(struct dictionary * dict, struct msg * msg, struct session ** session, int * new);
    22872273
    22882274/***************************************/
    … …  
    23702356 *  ENOMEM      : Unable to allocate enough memory to create the buffer object.
    23712357 */
    2372 int fd_msg_bufferize ( struct msg * msg, unsigned char ** S_OUT(buffer), size_t * S_OUT(len) );
     2358int fd_msg_bufferize ( struct msg * msg, unsigned char ** buffer, size_t * len );
    23732359
    23742360/*
    … …  
    23922378 *  EINVAL      : A parameter is invalid.
    23932379 */
    2394 int fd_msg_parse_buffer ( unsigned char ** buffer, size_t buflen, struct msg ** S_OUT(msg) );
     2380int fd_msg_parse_buffer ( unsigned char ** buffer, size_t buflen, struct msg ** msg );
    23952381
    23962382/* Parsing Error Information structure */
    … …  
    24262412 *  ENOTSUP     : No dictionary definition for the command or one of the mandatory AVP was found.
    24272413 */
    2428 int fd_msg_parse_dict ( msg_or_avp * object, struct dictionary * dict, struct fd_pei * S_OUT(error_info) );
     2414int fd_msg_parse_dict ( msg_or_avp * object, struct dictionary * dict, struct fd_pei * error_info );
    24292415
    24302416/*
    … …  
    24452431 *  ENOMEM      : Unable to allocate enough memory to complete the operation.
    24462432 */
    2447 int fd_msg_parse_rules ( msg_or_avp * object, struct dictionary * dict, struct fd_pei * S_OUT(error_info));
     2433int fd_msg_parse_rules ( msg_or_avp * object, struct dictionary * dict, struct fd_pei * error_info);
    24482434
    24492435
    … …  
    26242610 */
    26252611int fd_disp_register ( int (*cb)( struct msg **, struct avp *, struct session *, enum disp_action *),
    2626                         enum disp_how how, struct disp_when * when, struct disp_hdl ** S_OUT(handle) );
     2612                        enum disp_how how, struct disp_when * when, struct disp_hdl ** handle );
    26272613
    26282614/*
    … …  
    26902676 *  ENOMEM      : Not enough memory to complete the creation. 
    26912677 */
    2692 int fd_fifo_new ( struct fifo ** S_OUT(queue) );
     2678int fd_fifo_new ( struct fifo ** queue );
    26932679
    26942680/*
    … …  
    28112797 *  EINVAL      : A parameter is invalid.
    28122798 */
    2813 int fd_fifo_get_int ( struct fifo * queue, void ** S_OUT(item) );
     2799int fd_fifo_get_int ( struct fifo * queue, void ** item );
    28142800#define fd_fifo_get(queue, item) \
    28152801        fd_fifo_get_int((queue), (void *)(item))
    … …  
    28312817 *  EWOULDBLOCK : The queue was empty.
    28322818 */
    2833 int fd_fifo_tryget_int ( struct fifo * queue, void ** S_OUT(item) );
     2819int fd_fifo_tryget_int ( struct fifo * queue, void ** item );
    28342820#define fd_fifo_tryget(queue, item) \
    28352821        fd_fifo_tryget_int((queue), (void *)(item))
    … …  
    28532839 *  ETIMEDOUT   : The time out has passed and no item has been received.
    28542840 */
    2855 int fd_fifo_timedget_int ( struct fifo * queue, void ** S_OUT(item), const struct timespec *abstime );
     2841int fd_fifo_timedget_int ( struct fifo * queue, void ** item, const struct timespec *abstime );
    28562842#define fd_fifo_timedget(queue, item, abstime) \
    28572843        fd_fifo_timedget_int((queue), (void *)(item), (abstime))
Note: See TracChangeset for help on using the changeset viewer.