Changeset 330df83 in mainline for uspace/srv/net/inetsrv/ntrans.c


Ignore:
Timestamp:
2013-07-19T20:42:57Z (11 years ago)
Author:
Manuele Conti <conti.ma@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f4cbf9dd
Parents:
8a8a08d1 (diff), cd18cd1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge with mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/inetsrv/ntrans.c

    r8a8a08d1 r330df83  
    4747static FIBRIL_CONDVAR_INITIALIZE(ntrans_cv);
    4848
     49/** Look for address in translation table
     50 *
     51 * @param ip_addr IPv6 address
     52 *
     53 * @return inet_ntrans_t with the address on success
     54 * @return NULL if nothing found
     55 */
    4956static inet_ntrans_t *ntrans_find(addr128_t ip_addr)
    5057{
    … …  
    6067}
    6168
     69/** Add entry to translation table
     70 *
     71 * @param ip_addr  IPv6 address of the new entry
     72 * @param mac_addr MAC address of the new entry
     73 *
     74 * @return EOK on success
     75 * @return ENOMEM if not enough memory
     76 *
     77 */
    6278int ntrans_add(addr128_t ip_addr, addr48_t mac_addr)
    6379{
    … …  
    86102}
    87103
     104/** Remove entry from translation table
     105 *
     106 * @param ip_addr IPv6 address of the entry to be removed
     107 *
     108 * @return EOK on success
     109 * @return ENOENT when no such address found
     110 *
     111 */
    88112int ntrans_remove(addr128_t ip_addr)
    89113{
    … …  
    104128}
    105129
     130/** Translate IPv6 address to MAC address using the translation table
     131 *
     132 * @param ip_addr  IPv6 address to be translated
     133 * @param mac_addr MAC address to be assigned
     134 *
     135 * @return EOK on success
     136 * @return ENOENT when no such address found
     137 *
     138 */
    106139int ntrans_lookup(addr128_t ip_addr, addr48_t mac_addr)
    107140{
    … …  
    118151}
    119152
     153/** Wait on translation table CV for some time
     154 *
     155 * @param timeout Timeout in microseconds
     156 *
     157 * @return EOK if woken up by another fibril
     158 * @return ETIMEDOUT if timed out
     159 *
     160 */
    120161int ntrans_wait_timeout(suseconds_t timeout)
    121162{
Note: See TracChangeset for help on using the changeset viewer.